diff options
author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2013-12-24 14:19:23 -0500 |
---|---|---|
committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2013-12-31 13:32:08 -0500 |
commit | 12b4629a9fb80fecaebadc217b13b8776ed8dbef (patch) | |
tree | d4b02104183be9d6e20634812949059f4dcd70d7 /fs/ceph/mds_client.c | |
parent | e37180c0f2f0c5b21e9295d5b19874ff4a659be1 (diff) |
libceph: all features fields must be u64
In preparation for ceph_features.h update, change all features fields
from unsigned int/u32 to u64. (ceph.git has ~40 feature bits at this
point.)
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph/mds_client.c')
-rw-r--r-- | fs/ceph/mds_client.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index d90861f45210..4a13f6e72069 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -63,7 +63,7 @@ static const struct ceph_connection_operations mds_con_ops; | |||
63 | */ | 63 | */ |
64 | static int parse_reply_info_in(void **p, void *end, | 64 | static int parse_reply_info_in(void **p, void *end, |
65 | struct ceph_mds_reply_info_in *info, | 65 | struct ceph_mds_reply_info_in *info, |
66 | int features) | 66 | u64 features) |
67 | { | 67 | { |
68 | int err = -EIO; | 68 | int err = -EIO; |
69 | 69 | ||
@@ -98,7 +98,7 @@ bad: | |||
98 | */ | 98 | */ |
99 | static int parse_reply_info_trace(void **p, void *end, | 99 | static int parse_reply_info_trace(void **p, void *end, |
100 | struct ceph_mds_reply_info_parsed *info, | 100 | struct ceph_mds_reply_info_parsed *info, |
101 | int features) | 101 | u64 features) |
102 | { | 102 | { |
103 | int err; | 103 | int err; |
104 | 104 | ||
@@ -145,7 +145,7 @@ out_bad: | |||
145 | */ | 145 | */ |
146 | static int parse_reply_info_dir(void **p, void *end, | 146 | static int parse_reply_info_dir(void **p, void *end, |
147 | struct ceph_mds_reply_info_parsed *info, | 147 | struct ceph_mds_reply_info_parsed *info, |
148 | int features) | 148 | u64 features) |
149 | { | 149 | { |
150 | u32 num, i = 0; | 150 | u32 num, i = 0; |
151 | int err; | 151 | int err; |
@@ -217,7 +217,7 @@ out_bad: | |||
217 | */ | 217 | */ |
218 | static int parse_reply_info_filelock(void **p, void *end, | 218 | static int parse_reply_info_filelock(void **p, void *end, |
219 | struct ceph_mds_reply_info_parsed *info, | 219 | struct ceph_mds_reply_info_parsed *info, |
220 | int features) | 220 | u64 features) |
221 | { | 221 | { |
222 | if (*p + sizeof(*info->filelock_reply) > end) | 222 | if (*p + sizeof(*info->filelock_reply) > end) |
223 | goto bad; | 223 | goto bad; |
@@ -238,7 +238,7 @@ bad: | |||
238 | */ | 238 | */ |
239 | static int parse_reply_info_create(void **p, void *end, | 239 | static int parse_reply_info_create(void **p, void *end, |
240 | struct ceph_mds_reply_info_parsed *info, | 240 | struct ceph_mds_reply_info_parsed *info, |
241 | int features) | 241 | u64 features) |
242 | { | 242 | { |
243 | if (features & CEPH_FEATURE_REPLY_CREATE_INODE) { | 243 | if (features & CEPH_FEATURE_REPLY_CREATE_INODE) { |
244 | if (*p == end) { | 244 | if (*p == end) { |
@@ -262,7 +262,7 @@ bad: | |||
262 | */ | 262 | */ |
263 | static int parse_reply_info_extra(void **p, void *end, | 263 | static int parse_reply_info_extra(void **p, void *end, |
264 | struct ceph_mds_reply_info_parsed *info, | 264 | struct ceph_mds_reply_info_parsed *info, |
265 | int features) | 265 | u64 features) |
266 | { | 266 | { |
267 | if (info->head->op == CEPH_MDS_OP_GETFILELOCK) | 267 | if (info->head->op == CEPH_MDS_OP_GETFILELOCK) |
268 | return parse_reply_info_filelock(p, end, info, features); | 268 | return parse_reply_info_filelock(p, end, info, features); |
@@ -280,7 +280,7 @@ static int parse_reply_info_extra(void **p, void *end, | |||
280 | */ | 280 | */ |
281 | static int parse_reply_info(struct ceph_msg *msg, | 281 | static int parse_reply_info(struct ceph_msg *msg, |
282 | struct ceph_mds_reply_info_parsed *info, | 282 | struct ceph_mds_reply_info_parsed *info, |
283 | int features) | 283 | u64 features) |
284 | { | 284 | { |
285 | void *p, *end; | 285 | void *p, *end; |
286 | u32 len; | 286 | u32 len; |