kclient: fix checkpatch label warnings

diff --git a/src/TODO b/src/TODO
index b06de2f66d0980420fb1ee03c1352939935b4816..70cc03014b4fbacadb2b0d5b1d5b398e3b9eb87e 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -29,6 +29,9 @@ v0.14
 /- deb packages fixed up
 
 v0.15
+/- clean up msgr protocol checks
+- kclient checkpatch fixes
+
 - kclient: retry alloc on ENOMEM when reading from connection?
 - client authentication
 - radosgw
@@ -36,9 +39,6 @@ v0.15
 
 - mds: put migration vectors in mdsmap
 
-- msgr
-  - check protocols during connection handshake, not per-message?
-
 
 bugs
 - premature filejournal trimming?

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index 6f802daeecdd80efbd21bfb492456cde5cbf1d5e..e4b5414624181f0b39a84bcd45abac99510113f5 100644 (file)
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -852,7 +852,7 @@ get_more_pages:
                if (wbc->nr_to_write <= 0)
                        done = 1;
 
-       release_pvec_pages:
+release_pvec_pages:
                dout("pagevec_release on %d pages (%p)\n", (int)pvec.nr,
                     pvec.nr ? pvec.pages[0] : NULL);
                pagevec_release(&pvec);

diff --git a/src/kernel/caps.c b/src/kernel/caps.c
index 35aec4fb864235e5673a67b7a9081006a964e8eb..fb4cf0a1c4ba1bd99b636aa47e7396cfb2c1705b 100644 (file)
--- a/src/kernel/caps.c
+++ b/src/kernel/caps.c
@@ -418,7 +418,7 @@ static void __cap_delay_requeue(struct ceph_mds_client *mdsc,
                        list_del_init(&ci->i_cap_delay_list);
                }
                list_add_tail(&ci->i_cap_delay_list, &mdsc->cap_delay_list);
-       no_change:
+no_change:
                spin_unlock(&mdsc->cap_delay_lock);
        }
 }

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index cf065b6110292e446a69955a1d6aabfbc0d97e6e..cc19464f03cae23bcaea968ecda768ad28df4f82 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -819,7 +819,7 @@ static void kick_requests(struct ceph_osd_client *osdc,
                        continue;
                }
 
-       kick:
+kick:
                dout("kicking tid %llu osd%d\n", req->r_tid, req->r_osd->o_osd);
                req->r_flags |= CEPH_OSD_FLAG_RETRY;
                err = __send_request(osdc, req);

diff --git a/src/kernel/snap.c b/src/kernel/snap.c
index 71cc0d0ee7bb259f58af80a6ff4d69e5ffb18522..529aa1c3b85b223f51a87b590b4ab914fa5d32cf 100644 (file)
--- a/src/kernel/snap.c
+++ b/src/kernel/snap.c
@@ -819,7 +819,7 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc,
                        iput(inode);
                        continue;
 
-               skip_inode:
+skip_inode:
                        spin_unlock(&inode->i_lock);
                        iput(inode);
                }
@@ -869,7 +869,7 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc,
                        ci->i_snap_realm = realm;
                        spin_unlock(&realm->inodes_with_caps_lock);
                        ceph_get_snap_realm(mdsc, realm);
-               split_skip_inode:
+split_skip_inode:
                        spin_unlock(&inode->i_lock);
                        iput(inode);
                }