diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2013-12-24 20:19:23 +0100 |
|---|---|---|
| committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2013-12-31 19:32:08 +0100 |
| commit | 12b4629a9fb80fecaebadc217b13b8776ed8dbef (patch) | |
| tree | d4b02104183be9d6e20634812949059f4dcd70d7 /net/ceph | |
| parent | rbd: tear down watch request if rbd_dev_device_setup() fails (diff) | |
| download | linux-12b4629a9fb80fecaebadc217b13b8776ed8dbef.tar.xz linux-12b4629a9fb80fecaebadc217b13b8776ed8dbef.zip | |
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 'net/ceph')
| -rw-r--r-- | net/ceph/ceph_common.c | 4 | ||||
| -rw-r--r-- | net/ceph/messenger.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index 34b11ee8124e..43d8177a52e1 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c @@ -461,8 +461,8 @@ EXPORT_SYMBOL(ceph_client_id); * create a fresh client instance */ struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private, - unsigned int supported_features, - unsigned int required_features) + u64 supported_features, + u64 required_features) { struct ceph_client *client; struct ceph_entity_addr *myaddr = NULL; diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 4a5df7b1cc9f..260670558746 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2853,8 +2853,8 @@ static void con_fault(struct ceph_connection *con) */ void ceph_messenger_init(struct ceph_messenger *msgr, struct ceph_entity_addr *myaddr, - u32 supported_features, - u32 required_features, + u64 supported_features, + u64 required_features, bool nocrc) { msgr->supported_features = supported_features; |