From: Sage Weil Date: Thu, 10 Sep 2009 18:23:33 +0000 (-0700) Subject: kclient: fix checkpatch label warnings X-Git-Tag: v0.15~87 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=122c612156a61de4a67b4534f4e1db19ffaddcee;p=ceph.git kclient: fix checkpatch label warnings --- diff --git a/src/TODO b/src/TODO index b06de2f66d0..70cc03014b4 100644 --- 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 6f802daeecd..e4b54146241 100644 --- 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 35aec4fb864..fb4cf0a1c4b 100644 --- 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 cf065b61102..cc19464f03c 100644 --- 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 71cc0d0ee7b..529aa1c3b85 100644 --- 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); }