summaryrefslogtreecommitdiff
path: root/fs/ceph
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-09-30 15:04:42 +0200
committerIlya Dryomov <idryomov@gmail.com>2015-11-02 23:36:47 +0100
commit777d738a5e58ba3b6f3932ab1543ce93703f4873 (patch)
treed68c2095b74a7d8e40d2bc39a5512cf1789563eb /fs/ceph
parent1291fb950f12005600eb410c206fffd7231dee6f (diff)
ceph: fix message length computation
create_request_message() computes the maximum length of a message, but uses the wrong type for the time stamp: sizeof(struct timespec) may be 8 or 16 depending on the architecture, while sizeof(struct ceph_timespec) is always 8, and that is what gets put into the message. Found while auditing the uses of timespec for y2038 problems. Fixes: b8e69066d8af ("ceph: include time stamp in every MDS request") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/mds_client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 51cb02da75d9..fe2c982764e7 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1935,7 +1935,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
len = sizeof(*head) +
pathlen1 + pathlen2 + 2*(1 + sizeof(u32) + sizeof(u64)) +
- sizeof(struct timespec);
+ sizeof(struct ceph_timespec);
/* calculate (max) length for cap releases */
len += sizeof(struct ceph_mds_request_release) *