kclient: some sparse fixes

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 8810e2853054cf19e519a2851bea7349b7586342..68acf639ad7a35b4fa5faf83e868285342192032 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -620,7 +620,7 @@ static inline const char *ceph_mds_state_name(int s)
        case CEPH_MDS_STATE_STOPPING:   return "up:stopping";
        default: return "";
        }
-       return 0;
+       return NULL;
 }
 
 

diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index 309ce847e6eef88ac999c0ec5aa42713a8631132..8df2a8e403c6de496fb9af634c8891379aa86007 100644 (file)
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -666,9 +666,6 @@ static int dentry_lease_is_valid(struct dentry *dentry)
                                mds = s->s_mds;
                                seq = di->lease_seq;
                                di->lease_renew_after = 0;
-                       } else {
-                               dout(0, "should_renew = 0, %ld < %ld\n",
-                                    jiffies, di->lease_renew_after);
                        }
                } else {
                        ceph_put_mds_session(di->lease_session);

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index 96e58893f5d926182c58a15c3612668070ed9299..d38fffe64479703c7e1dbcfef300b634ee57a568 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -124,7 +124,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
        snaps = (void *)(op + num_op);
 
        head->client_inc = cpu_to_le32(1); /* always, for now. */
-       head->flags = flags;
+       head->flags = cpu_to_le32(flags);
        head->num_ops = cpu_to_le16(num_op);
        op->op = cpu_to_le16(opcode);
 
@@ -277,13 +277,14 @@ static void __unregister_request(struct ceph_osd_client *osdc,
        osdc->num_requests--;
        ceph_osdc_put_request(req);
 
+       ceph_sysfs_osd_req_cleanup(req);
+
        if (req->r_tid == osdc->timeout_tid) {
                if (osdc->num_requests == 0) {
                        dout(30, "no requests, canceling timeout\n");
                        osdc->timeout_tid = 0;
                        cancel_delayed_work(&osdc->timeout_work);
                } else {
-                       struct ceph_osd_request *req;
                        int ret;
 
                        ret = radix_tree_gang_lookup(&osdc->request_tree,
@@ -297,8 +298,6 @@ static void __unregister_request(struct ceph_osd_client *osdc,
                                                     jiffies));
                }
        }
-
-       ceph_sysfs_osd_req_cleanup(req);
 }
 
 /*