kclient: some more code cleanup

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index e3bd98f0e7405df9013e8384e25c7adc4cbc1a7e..938ed290104d7f44674bb04a80febd21b1642fd9 100644 (file)
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -59,7 +59,7 @@ static int ceph_set_page_dirty(struct page *page,
                     snapc, snapc->seq, snapc->num_snaps);
        } else {
                struct list_head *p;
-               struct ceph_cap_snap *capsnap = 0;
+               struct ceph_cap_snap *capsnap = NULL;
                list_for_each(p, &ci->i_cap_snaps) {
                        capsnap = list_entry(p, struct ceph_cap_snap,
                                             ci_item);
@@ -160,7 +160,7 @@ static void ceph_redirty_page(struct address_space *mapping, struct page *page)
 
 static int ceph_set_page_dirty_vfs(struct page *page)
 {
-       return ceph_set_page_dirty(page, 0);
+       return ceph_set_page_dirty(page, NULL);
 }
 
 static void ceph_invalidatepage(struct page *page, unsigned long offset)
@@ -200,7 +200,7 @@ static void ceph_invalidatepage(struct page *page, unsigned long offset)
 
 static int ceph_releasepage(struct page *page, gfp_t g)
 {
-       struct inode *inode = page->mapping ? page->mapping->host:0;
+       struct inode *inode = page->mapping ? page->mapping->host:NULL;
        dout(20, "%p releasepage %p idx %lu\n", inode, page, page->index);
        WARN_ON(PageDirty(page));
        WARN_ON(page->private);
@@ -303,9 +303,9 @@ static int ceph_readpages(struct file *file, struct address_space *mapping,
 static struct ceph_snap_context *__get_oldest_context(struct inode *inode)
 {
        struct ceph_inode_info *ci = ceph_inode(inode);
-       struct ceph_snap_context *snapc = 0;
+       struct ceph_snap_context *snapc = NULL;
        struct list_head *p;
-       struct ceph_cap_snap *capsnap = 0;
+       struct ceph_cap_snap *capsnap = NULL;
 
        list_for_each(p, &ci->i_cap_snaps) {
                capsnap = list_entry(p, struct ceph_cap_snap, ci_item);
@@ -327,7 +327,7 @@ static struct ceph_snap_context *__get_oldest_context(struct inode *inode)
 
 static struct ceph_snap_context *get_oldest_context(struct inode *inode)
 {
-       struct ceph_snap_context *snapc = 0;
+       struct ceph_snap_context *snapc = NULL;
        spin_lock(&inode->i_lock);
        snapc = __get_oldest_context(inode);
        spin_unlock(&inode->i_lock);
@@ -376,7 +376,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)
 
        /* verify this is a writeable snap context */
        snapc = (void *)page->private;
-       if (snapc == 0) {
+       if (snapc == NULL) {
                dout(20, "writepage %p page %p not dirty?\n", inode, page);
                goto out;
        }
@@ -426,7 +426,7 @@ static int ceph_writepage(struct page *page, struct writeback_control *wbc)
  * lame release_pages helper.  release_pages() isn't exported to
  * modules.
  */
-void ceph_release_pages(struct page **pages, int num)
+static void ceph_release_pages(struct page **pages, int num)
 {
        struct pagevec pvec;
        int i;
@@ -512,9 +512,9 @@ static int ceph_writepages_start(struct address_space *mapping,
        pgoff_t index, start, end;
        int range_whole = 0;
        int should_loop = 1;
-       struct page **pages = 0;
+       struct page **pages = NULL;
        pgoff_t max_pages = 0, max_pages_ever = 0;
-       struct ceph_snap_context *snapc = 0, *last_snapc = 0;
+       struct ceph_snap_context *snapc = NULL, *last_snapc = NULL;
        struct pagevec pvec;
        int done = 0;
        int rc = 0;
@@ -589,7 +589,7 @@ retry:
                u64 offset, len;
                struct ceph_osd_request *req;
 
-               req = 0;
+               req = NULL;
                next = 0;
                locked_pages = 0;
                max_pages = max_pages_ever;
@@ -746,7 +746,7 @@ get_more_pages:
 
        release_pages:
                dout(50, "pagevec_release on %d pages (%p)\n", (int)pvec.nr,
-                    pvec.nr ? pvec.pages[0] : 0);
+                    pvec.nr ? pvec.pages[0] : NULL);
                pagevec_release(&pvec);
 
                if (locked_pages && !done)
@@ -832,7 +832,7 @@ retry_locked:
                     page, snapc);
                if (!clear_page_dirty_for_io(page))
                        goto retry_locked;
-               r = writepage_nounlock(page, 0);
+               r = writepage_nounlock(page, NULL);
                if (r < 0)
                        goto fail_nosnap;
                goto retry_locked;

diff --git a/src/kernel/export.c b/src/kernel/export.c
index f81ff7081b75cf7c82745e4578be0b73ba5cf353..fc8e12822dbb7bee9790f47af805bf00e217268f 100644 (file)
--- a/src/kernel/export.c
+++ b/src/kernel/export.c
@@ -17,7 +17,7 @@ int ceph_debug_export = -1;
 
 #define IPSZ (sizeof(struct ceph_inopath_item) / sizeof(u32))
 
-int ceph_encode_fh(struct dentry *dentry, __u32 *rawfh, int *max_len, 
+static int ceph_encode_fh(struct dentry *dentry, __u32 *rawfh, int *max_len, 
                   int connectable)
 {
        int type = 1;

diff --git a/src/kernel/file.c b/src/kernel/file.c
index 33dfd077da99ebff90b109531a9effae0c899895..2b6a2067707fc9f3af8eca8c86e9d41845deff63 100644 (file)
--- a/src/kernel/file.c
+++ b/src/kernel/file.c
@@ -40,7 +40,7 @@ prepare_open_request(struct super_block *sb, struct dentry *dentry,
        if (IS_ERR(path))
                return ERR_PTR(PTR_ERR(path));
        req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_OPEN, pathbase, path,
-                                      0, 0,
+                                      0, NULL,
                                       dentry, want_auth);
        kfree(path);
        req->r_expected_cap = kmalloc(sizeof(struct ceph_cap), GFP_NOFS);
@@ -106,7 +106,7 @@ int ceph_open(struct inode *inode, struct file *file)
 
        /* can we re-use existing caps? */
        spin_lock(&inode->i_lock);
-       if ((__ceph_caps_issued(ci, 0) & wantcaps) == wantcaps) {
+       if ((__ceph_caps_issued(ci, NULL) & wantcaps) == wantcaps) {
                dout(10, "open fmode %d caps %d using existing on %p\n",
                     fmode, wantcaps, inode);
                __ceph_get_fmode(ci, fmode);
@@ -119,7 +119,7 @@ int ceph_open(struct inode *inode, struct file *file)
        dentry = d_find_alias(inode);
        if (!dentry)
                return -ESTALE;  /* blech */
-       ceph_mdsc_lease_release(mdsc, inode, 0, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_ICONTENT);
        req = prepare_open_request(inode->i_sb, dentry, flags, 0);
        if (IS_ERR(req)) {
                err = PTR_ERR(req);
@@ -165,7 +165,7 @@ struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
        if (IS_ERR(req))
                return ERR_PTR(PTR_ERR(req));
        if (flags & O_CREAT)
-               ceph_mdsc_lease_release(mdsc, dir, 0, CEPH_LOCK_ICONTENT);
+               ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_ICONTENT);
        dget(dentry);                /* to match put_request below */
        req->r_last_dentry = dentry; /* use this dentry in fill_trace */
        req->r_locked_dir = dir;     /* caller holds dir->i_mutex */
@@ -267,7 +267,7 @@ static ssize_t ceph_sync_write(struct file *file, const char __user *data,
  * atomically grab references, so that those bits are not released
  * mid-read.
  */
-ssize_t ceph_aio_read(struct kiocb *iocb, const struct iovec *iov,
+static ssize_t ceph_aio_read(struct kiocb *iocb, const struct iovec *iov,
                      unsigned long nr_segs, loff_t pos)
 {
        struct file *filp = iocb->ki_filp;
@@ -330,7 +330,7 @@ static void check_max_size(struct inode *inode, loff_t endoff)
 
 /*
  */
-ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov,
+static ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov,
                       unsigned long nr_segs, loff_t pos)
 {
        struct file *file = iocb->ki_filp;

diff --git a/src/kernel/ioctl.c b/src/kernel/ioctl.c
index 03e7b80edfa18bd88a916a74461db06b7842e0b2..5b3100b1fa8c73972ca41131a29169602cbbd0cc 100644 (file)
--- a/src/kernel/ioctl.c
+++ b/src/kernel/ioctl.c
@@ -47,12 +47,12 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)
        if (IS_ERR(path))
                return PTR_ERR(path);
        req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_LSETLAYOUT,
-                                      pathbase, path, 0, 0,
+                                      pathbase, path, 0, NULL,
                                       file->f_dentry, USE_ANY_MDS);
        kfree(path);
        reqh = req->r_request->front.iov_base;
        reqh->args.setlayout.layout = layout;
-       ceph_mdsc_lease_release(mdsc, inode, 0, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_ICONTENT);
        err = ceph_mdsc_do_request(mdsc, req);
        ceph_mdsc_put_request(req);
        return err;