kclient: fix else as per CodingStyle

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index bea6ec70868e6d6e0d38866537ef39e43ccec113..3902c149cc2a609ff13b0c2b7be37cdb4b593c3a 100644 (file)
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -199,9 +199,10 @@ static void ceph_invalidatepage(struct page *page, unsigned long offset)
                ceph_put_snap_context(snapc);
                page->private = 0;
                ClearPagePrivate(page);
-       } else
+       } else {
                dout(20, "%p invalidatepage %p idx %lu partial dirty page\n",
                     &ci->vfs_inode, page, page->index);
+       }
 }
 
 /* just a sanity check */
@@ -616,8 +617,9 @@ get_more_pages:
                for (i = 0; i < pvec_pages && locked_pages < max_pages; i++) {
                        page = pvec.pages[i];
                        dout(20, "? %p idx %lu\n", page, page->index);
-                       if (locked_pages == 0)
+                       if (locked_pages == 0) {
                                lock_page(page);  /* first page */
+                       }
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
                        else if (!trylock_page(page))
 #else

diff --git a/src/kernel/caps.c b/src/kernel/caps.c
index 532157e6414c5c69a281422170806d92a34c951d..c8ad51f2d4806ec16465221daadef17223ef0030 100644 (file)
--- a/src/kernel/caps.c
+++ b/src/kernel/caps.c
@@ -162,8 +162,9 @@ retry:
        if (!ci->i_snap_realm) {
                ci->i_snap_realm = realm;
                list_add(&ci->i_snap_realm_item, &realm->inodes_with_caps);
-       } else
+       } else {
                ceph_put_snap_realm(realm);
+       }
 
        dout(10, "add_cap inode %p (%llx.%llx) cap %xh now %xh seq %d mds%d\n",
             inode, ceph_vinop(inode), issued, issued|cap->issued, seq, mds);
@@ -728,9 +729,10 @@ int ceph_get_cap_refs(struct ceph_inode_info *ci, int need, int want, int *got,
                        __take_cap_refs(ci, *got);
                        ret = 1;
                }
-       } else
+       } else {
                dout(30, "get_cap_refs %p have %d needed %d\n", inode,
                     have, need);
+       }
 sorry:
        spin_unlock(&inode->i_lock);
        dout(30, "get_cap_refs %p ret %d got %d\n", inode,
@@ -840,9 +842,9 @@ void ceph_put_wrbuffer_cap_refs(struct ceph_inode_info *ci, int nr,
        }
        spin_unlock(&inode->i_lock);
 
-       if (last)
+       if (last) {
                ceph_check_caps(ci, 0);
-       else if (last_snap) {
+       } else if (last_snap) {
                ceph_flush_snaps(ci);
                wake_up(&ci->i_cap_wq);
        }
@@ -941,9 +943,9 @@ static int handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
                dout(10, "revocation: %d -> %d\n", cap->issued, newcaps);
                if ((cap->issued & ~newcaps) & CEPH_CAP_RDCACHE)
                        invalidate = 1;
-               if ((used & ~newcaps) & CEPH_CAP_WRBUFFER)
+               if ((used & ~newcaps) & CEPH_CAP_WRBUFFER) {
                        writeback = 1; /* will delay ack */
-               else {
+               } else {
                        /*
                         * we're not using revoked caps.. ack now.
                         * re-use incoming message.
@@ -1086,12 +1088,12 @@ static void handle_cap_trunc(struct inode *inode,
         * don't need to truncate.
         */
        spin_lock(&inode->i_lock);
-       if (ci->i_vmtruncate_to < 0 && size > inode->i_size)
+       if (ci->i_vmtruncate_to < 0 && size > inode->i_size) {
                dout(10, "clean fwd truncate, no vmtruncate needed\n");
-       else if (ci->i_vmtruncate_to >= 0 && size >= ci->i_vmtruncate_to)
+       } else if (ci->i_vmtruncate_to >= 0 && size >= ci->i_vmtruncate_to) {
                dout(10, "trunc to %lld < %lld already queued\n",
                     ci->i_vmtruncate_to, size);
-       else {
+       } else {
                /* we need to trunc even smaller */
                dout(10, "queueing trunc %lld -> %lld\n", inode->i_size, size);
                ci->i_vmtruncate_to = size;
@@ -1150,8 +1152,9 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex,
                        ci->i_cap_exporting_issued = cap->issued;
                }
                was_last = __ceph_remove_cap(cap);
-       } else
+       } else {
                WARN_ON(!cap);
+       }
 
        spin_unlock(&inode->i_lock);
        if (was_last)

diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index 04260db92d619ba1e693d29a86369db5b65423d9..e1256ff5148dd7762784501ac2f474c48e9f7fac 100644 (file)
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -214,8 +214,9 @@ nextfrag:
                        filp->f_pos++;
                }
                skew = -2;  /* compensate for . and .. */
-       } else
+       } else {
                skew = 0;
+       }
 
        rinfo = &fi->last_readdir->r_reply_info;
        dout(10, "readdir frag %x num %d off %d skew %d\n", frag,
@@ -326,16 +327,17 @@ struct dentry *ceph_finish_lookup(struct ceph_mds_request *req,
                                req->r_last_dentry = d_alloc(dentry->d_parent,
                                                             &dentry->d_name);
                                d_rehash(req->r_last_dentry);
-                       } else
+                       } else {
                                d_add(dentry, NULL);
+                       }
                }
                err = 0;
        }
        if (err)
                dentry = ERR_PTR(err);
-       else if (dentry != req->r_last_dentry) {
+       else if (dentry != req->r_last_dentry)
                dentry = dget(req->r_last_dentry);   /* we got spliced */
-       } else
+       else
                dentry = NULL;
        return dentry;
 }
@@ -550,10 +552,11 @@ static int ceph_mkdir(struct inode *dir, struct dentry *dentry, int mode)
                snap[snaplen] = 0;
                pathdentry = d_find_alias(dir);
                dout(5, "mksnap dir %p snap '%s' dn %p\n", dir, snap, dentry);
-       } else if (ceph_snap(dir) != CEPH_NOSNAP)
+       } else if (ceph_snap(dir) != CEPH_NOSNAP) {
                return -EROFS;
-       else
+       } else {
                dout(5, "mkdir dir %p dn %p mode 0%o\n", dir, dentry, mode);
+       }
        path = ceph_build_path(pathdentry, &pathlen, &pathbase, 1);
        if (pathdentry != dentry)
                dput(pathdentry);
@@ -622,9 +625,9 @@ static int ceph_link(struct dentry *old_dentry, struct inode *dir,
        ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_ICONTENT);
        err = ceph_mdsc_do_request(mdsc, req);
        ceph_mdsc_put_request(req);
-       if (err)
+       if (err) {
                d_drop(dentry);
-       else if (req->r_reply_info.trace_numd == 0) {
+       } else if (req->r_reply_info.trace_numd == 0) {
                /* no trace */
                struct inode *inode = old_dentry->d_inode;
                inc_nlink(inode);
@@ -663,11 +666,12 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry)
                snap[snaplen] = 0;
                pathdentry = d_find_alias(dir);
                dout(5, "rmsnap dir %p '%s' dn %p\n", dir, snap, dentry);
-       } else if (ceph_snap(dir) != CEPH_NOSNAP)
+       } else if (ceph_snap(dir) != CEPH_NOSNAP) {
                return -EROFS;
-       else
+       } else {
                dout(5, "unlink/rmdir dir %p dn %p inode %p\n",
                     dir, dentry, inode);
+       }
        path = ceph_build_path(pathdentry, &pathlen, &pathbase, 1);
        if (pathdentry != dentry)
                dput(pathdentry);

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 669366b0315e5d8eaed0d86f7241b0537b50e4b4..b85d94e3a11038ace846b3ebe5da3dda70c25fa2 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -360,8 +360,9 @@ void ceph_fill_file_bits(struct inode *inode, int issued,
                                inode->i_mtime = *mtime;
                        if (timespec_compare(atime, &inode->i_atime) > 0)
                                inode->i_atime = *atime;
-               } else
+               } else {
                        warn = 1;
+               }
        } else {
                /* we have no write caps; whatever the MDS says is true */
                if (time_warp_seq >= ci->i_time_warp_seq) {
@@ -369,8 +370,9 @@ void ceph_fill_file_bits(struct inode *inode, int issued,
                        inode->i_mtime = *mtime;
                        inode->i_atime = *atime;
                        ci->i_time_warp_seq = time_warp_seq;
-               } else
+               } else {
                        warn = 1;
+               }
        }
        if (warn) /* time_warp_seq shouldn't go backwards */
                dout(10, "%p mds time_warp_seq %llu < %llu\n",
@@ -571,8 +573,9 @@ static int update_inode_lease(struct inode *inode,
                        is_new = 1;
                }
                list_move_tail(&ci->i_lease_item, &session->s_inode_leases);
-       } else
+       } else {
                mask = 0;
+       }
        spin_unlock(&inode->i_lock);
        if (is_new)
                igrab(inode);
@@ -755,9 +758,10 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in,
                dput(dn);
                dn = realdn;
                ceph_init_dentry(dn);
-       } else
+       } else {
                dout(10, "dn %p attached to %p ino %llx.%llx\n",
                     dn, dn->d_inode, ceph_vinop(dn->d_inode));
+       }
        if ((!prehash || *prehash) && d_unhashed(dn))
                d_rehash(dn);
 out:
@@ -1187,9 +1191,9 @@ retry_lookup:
                }
 
                /* inode */
-               if (dn->d_inode)
+               if (dn->d_inode) {
                        in = dn->d_inode;
-               else {
+               } else {
                        in = ceph_get_inode(parent->d_sb, vino);
                        if (in == NULL) {
                                dout(30, "new_inode badness\n");
@@ -1237,8 +1241,9 @@ void ceph_inode_set_size(struct inode *inode, loff_t size)
            (ci->i_reported_size << 1) < ci->i_max_size) {
                spin_unlock(&inode->i_lock);
                ceph_check_caps(ci, 0);
-       } else
+       } else {
                spin_unlock(&inode->i_lock);
+       }
 }
 
 /*
@@ -1317,8 +1322,9 @@ void __ceph_do_pending_vmtruncate(struct inode *inode)
                truncate_inode_pages(inode->i_mapping, to);
                if (wrbuffer_refs == 0)
                        ceph_check_caps(ci, 0);
-       } else
+       } else {
                dout(10, "__do_pending_vmtruncate %p nothing to do\n", inode);
+       }
 }
 
 /*
@@ -1831,8 +1837,9 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
                        ceph_decode_32_safe(&p, end, len, bad);
                        p += len;
                }
-       } else
+       } else {
                namelen = 0;
+       }
 
        /* include virtual dir xattrs */
        if ((inode->i_mode & S_IFMT) == S_IFDIR)
@@ -1859,8 +1866,9 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
                        ceph_decode_32(&p, len);
                        p += len;
                }
-       } else
+       } else {
                names[0] = 0;
+       }
 
        /* virtual xattr names, too */
        if ((inode->i_mode & S_IFMT) == S_IFDIR)

diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index a49b812f8e296db7bd7944cecc6a1a634abcc2ac..db2cf6b8defed02230dc0de81e0d62aed97e7a61 100644 (file)
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -630,8 +630,9 @@ static int wait_for_new_map(struct ceph_mds_client *mdsc,
                        err = 0;
                else if (err == 0)
                        err = -EIO;
-       } else
+       } else {
                wait_for_completion(&mdsc->map_waiters);
+       }
        mutex_lock(&mdsc->mutex);
        dout(30, "wait_for_new_map err %d\n", err);
        return err;
@@ -685,8 +686,9 @@ static int open_session(struct ceph_mds_client *mdsc,
                        err = 0;
                else if (err == 0)
                        err = -EIO;
-       } else
+       } else {
                wait_for_completion(&session->s_completion);
+       }
        dout(30, "open_session done waiting on session %p, state %d\n",
             session, session->s_state);
 
@@ -937,8 +939,9 @@ void renewed_caps(struct ceph_mds_client *mdsc,
                if (time_before(jiffies, session->s_cap_ttl)) {
                        dout(1, "mds%d caps renewed\n", session->s_mds);
                        wake = 1;
-               } else
+               } else {
                        dout(1, "mds%d caps still stale\n", session->s_mds);
+               }
        }
        dout(10, "renewed_caps mds%d ttl now %lu, was %s, now %s\n",
             session->s_mds, session->s_cap_ttl, was_stale ? "stale":"fresh",
@@ -1051,9 +1054,9 @@ ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op,
        void *p, *end;
        int pathlen;
 
-       if (op == CEPH_MDS_OP_FINDINODE)
+       if (op == CEPH_MDS_OP_FINDINODE) {
                pathlen = sizeof(u32) + ino1*sizeof(struct ceph_inopath_item);
-       else {
+       } else {
                pathlen = 2*(sizeof(ino1) + sizeof(__u32));
                if (path1)
                        pathlen += strlen(path1);
@@ -1856,11 +1859,13 @@ void ceph_mdsc_lease_release(struct ceph_mds_client *mdsc, struct inode *inode,
                        mds = di->lease_session->s_mds;
                        dnamelen = dentry->d_name.len;
                        len += dentry->d_name.len;
-               } else
+               } else {
                        mask &= ~CEPH_LOCK_DN;  /* no lease; clear DN bit */
+               }
                spin_unlock(&dentry->d_lock);
-       } else
+       } else {
                mask &= ~CEPH_LOCK_DN;  /* no lease; clear DN bit */
+       }
 
        /* inode lease? */
        ci = ceph_inode(inode);
@@ -1872,8 +1877,9 @@ void ceph_mdsc_lease_release(struct ceph_mds_client *mdsc, struct inode *inode,
                mds = ci->i_lease_session->s_mds;
                mask &= CEPH_LOCK_DN | ci->i_lease_mask;  /* lease is valid */
                ci->i_lease_mask &= ~mask;
-       } else
+       } else {
                mask &= CEPH_LOCK_DN;  /* no lease; clear all but DN bits */
+       }
        spin_unlock(&inode->i_lock);
 
        if (mask == 0) {
@@ -2168,8 +2174,9 @@ void ceph_mdsc_handle_map(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
                    ceph_mdsmap_get_state(newmap, from) ==
                    CEPH_MDS_STATE_RECONNECT)
                        send_mds_reconnect(mdsc, from);
-       } else
+       } else {
                mdsc->mdsmap = newmap;  /* first mds map */
+       }
 
        mutex_unlock(&mdsc->mutex);
        schedule_delayed(mdsc);

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index bf00ce8d8f4143b60a13567dde7a78d1a6ca8796..2c0a10281b6d56fde6202c0e751c0bdd8b012d47 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -93,8 +93,9 @@ static void ceph_write_space(struct sock *sk)
        if (test_bit(WRITE_PENDING, &con->state)) {
                dout(30, "ceph_write_space %p queueing write work\n", con);
                ceph_queue_con(con);
-       } else
+       } else {
                dout(30, "ceph_write_space %p nothing to write\n", con);
+       }
 
        /* since we have our own write_space, clear the SOCK_NOSPACE flag */
        clear_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
@@ -433,8 +434,9 @@ static int __register_connection(struct ceph_messenger *msgr,
        if (test_and_clear_bit(ACCEPTING, &con->state)) {
                list_del_init(&con->list_bucket);
                put_connection(con);
-       } else
+       } else {
                list_add(&con->list_all, &msgr->con_all);
+       }
 
        head = radix_tree_lookup(&msgr->con_tree, key);
        if (head) {

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index b51567f99ff39144f545871ce09b9a7507982f51..81ded96fdcea64c9c2b48d85471d4a88dee3f7a6 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -828,8 +828,9 @@ out:
                len -= rc;
                if (len > 0)
                        goto more;
-       } else
+       } else {
                finalrc = rc;
+       }
        dout(10, "sync_read result %d\n", finalrc);
        return finalrc;
 }
@@ -903,8 +904,9 @@ int ceph_osdc_readpages(struct ceph_osd_client *osdc,
                        req->r_pages[contig_pages] = page;
                        contig_pages++;
                        next_index++;
-               } else
+               } else {
                        break;
+               }
        }
        dout(10, "readpages found %d/%d contig\n", contig_pages, num_pages);
        if (contig_pages == 0)
@@ -1003,8 +1005,9 @@ out:
                len -= len;
                if (len > 0)
                        goto more;
-       } else
+       } else {
                finalrc = rc;
+       }
        dout(10, "sync_write result %d\n", finalrc);
        return finalrc;
 }

diff --git a/src/kernel/snap.c b/src/kernel/snap.c
index 4d02987d08814b58d0f29856c1234a6f2ae7f116..bf90bdc41c619b36de9f6bac29c7b7edb028dd65 100644 (file)
--- a/src/kernel/snap.c
+++ b/src/kernel/snap.c
@@ -274,8 +274,9 @@ static int dup_array(u64 **dst, __le64 *src, int num)
                        return -ENOMEM;
                for (i = 0; i < num; i++)
                        (*dst)[i] = le64_to_cpu(src[i]);
-       } else
+       } else {
                *dst = NULL;
+       }
        return 0;
 }
 
@@ -442,9 +443,10 @@ more:
                        dout(20, "update_snap_trace cap_snaps queued\n");
                }
 
-       } else
+       } else {
                dout(10, "update_snap_trace %llx %p seq %lld unchanged\n",
                     realm->ino, realm, realm->seq);
+       }
 
        /* ensure the parent is correct */
        err = adjust_snap_realm_parent(mdsc, realm, le64_to_cpu(ri->parent));
@@ -471,8 +473,9 @@ more:
                        goto fail;
 
                invalidate = 1;
-       } else if (!realm->cached_context)
+       } else if (!realm->cached_context) {
                invalidate = 1;
+       }
 
        dout(10, "done with %llx %p, invalidated=%d, %p %p\n", realm->ino,
             realm, invalidate, p, e);