From 7bfc61c5b62b3074c5de1f4d298c996e5ceb69b3 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 16 Jan 2009 14:31:03 -0800 Subject: [PATCH] kclient: some more sparse fixes --- src/kernel/inode.c | 4 ++-- src/kernel/messenger.c | 10 +++++----- src/kernel/osd_client.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/kernel/inode.c b/src/kernel/inode.c index 87debfeb04784..54b3d0bef502f 100644 --- a/src/kernel/inode.c +++ b/src/kernel/inode.c @@ -1485,7 +1485,7 @@ static int ceph_setattr_chmod(struct dentry *dentry, struct iattr *attr) spin_lock(&inode->i_lock); if (__ceph_caps_issued(ci, NULL) & CEPH_CAP_AUTH_EXCL) { - dout(10, "chmod holding auth EXCL, doing locally\n"); + dout(0, "chmod holding auth EXCL, doing locally\n"); inode->i_mode = attr->ia_mode; inode->i_ctime = CURRENT_TIME; ci->i_dirty_caps |= CEPH_CAP_AUTH_EXCL; @@ -1645,7 +1645,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) dout(10, "setattr: %p gid %d -> %d\n", inode, inode->i_uid, attr->ia_uid); if (ia_valid & ATTR_MODE) - dout(10, "setattr: %p mode 0%o -> 0%o\n", inode, inode->i_mode, + dout(0, "setattr: %p mode 0%o -> 0%o\n", inode, inode->i_mode, attr->ia_mode); if (ia_valid & ATTR_SIZE) dout(10, "setattr: %p size %lld -> %lld\n", inode, diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c index 85f71547e5733..d5f4a03bd08c6 100644 --- a/src/kernel/messenger.c +++ b/src/kernel/messenger.c @@ -1342,8 +1342,8 @@ accept: con->connect_seq, peer_gseq, replace ? "replace" : "new"); con->out_reply.tag = CEPH_MSGR_TAG_READY; - con->out_reply.global_seq = get_global_seq(con->msgr, 0); - con->out_reply.connect_seq = peer_cseq + 1; + con->out_reply.global_seq = cpu_to_le32(get_global_seq(con->msgr, 0)); + con->out_reply.connect_seq = cpu_to_le32(peer_cseq + 1); retry = false; prepare_read_tag(con); @@ -1470,7 +1470,7 @@ static int read_partial_message(struct ceph_connection *con) if (data_len > CEPH_MSG_MAX_DATA_LEN) return -EIO; - data_off = le32_to_cpu(m->hdr.data_off); + data_off = le16_to_cpu(m->hdr.data_off); if (data_len == 0) goto no_data; @@ -2160,7 +2160,7 @@ struct ceph_msg *ceph_msg_maybe_dup(struct ceph_msg *old) dup = ceph_msg_new(le16_to_cpu(old->hdr.type), le32_to_cpu(old->hdr.front_len), le32_to_cpu(old->hdr.data_len), - le32_to_cpu(old->hdr.data_off), + le16_to_cpu(old->hdr.data_off), old->pages); if (!dup) return ERR_PTR(-ENOMEM); @@ -2299,7 +2299,7 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, m->hdr.type = cpu_to_le16(type); m->hdr.front_len = cpu_to_le32(front_len); m->hdr.data_len = cpu_to_le32(page_len); - m->hdr.data_off = cpu_to_le32(page_off); + m->hdr.data_off = cpu_to_le16(page_off); m->hdr.priority = 0; m->hdr.mon_protocol = CEPH_MON_PROTOCOL; m->hdr.monc_protocol = CEPH_MONC_PROTOCOL; diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c index 1df4d18896e55..748c965e1eda2 100644 --- a/src/kernel/osd_client.c +++ b/src/kernel/osd_client.c @@ -1019,7 +1019,7 @@ more: reqm->pages = req->r_pages; reqm->nr_pages = req->r_num_pages; reqm->hdr.data_len = cpu_to_le32(len); - reqm->hdr.data_off = cpu_to_le32(off); + reqm->hdr.data_off = cpu_to_le16(off); rc = do_sync_request(osdc, req); out: @@ -1081,7 +1081,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, reqm->pages = req->r_pages; reqm->nr_pages = req->r_num_pages; reqm->hdr.data_len = cpu_to_le32(len); - reqm->hdr.data_off = cpu_to_le32(off); + reqm->hdr.data_off = cpu_to_le16(off); rc = do_sync_request(osdc, req); ceph_osdc_put_request(req); @@ -1119,7 +1119,7 @@ int ceph_osdc_writepages_start(struct ceph_osd_client *osdc, reqm->pages = req->r_pages; reqm->nr_pages = req->r_num_pages = num_pages; reqm->hdr.data_len = cpu_to_le32(len); - reqm->hdr.data_off = cpu_to_le32(off); + reqm->hdr.data_off = cpu_to_le16(off); rc = start_request(osdc, req); return rc; -- 2.39.5