diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-15 21:32:04 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-15 21:32:04 +0200 |
| commit | 9a64e8e0ace51b309fdcff4b4754b3649250382a (patch) | |
| tree | 1f0d75c196c5ab0408c55ed6cf3a152f1f921e15 /net/ceph/ceph_common.c | |
| parent | libceph: flush msgr queue during mon_client shutdown (diff) | |
| parent | Linux 3.5-rc1 (diff) | |
| download | linux-9a64e8e0ace51b309fdcff4b4754b3649250382a.tar.xz linux-9a64e8e0ace51b309fdcff4b4754b3649250382a.zip | |
Merge tag 'v3.5-rc1'
Linux 3.5-rc1
Conflicts:
net/ceph/messenger.c
Diffstat (limited to 'net/ceph/ceph_common.c')
| -rw-r--r-- | net/ceph/ceph_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index c815f31a1a3f..58b09efb528d 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c @@ -441,8 +441,8 @@ EXPORT_SYMBOL(ceph_client_id); * create a fresh client instance */ struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private, - unsigned supported_features, - unsigned required_features) + unsigned int supported_features, + unsigned int required_features) { struct ceph_client *client; struct ceph_entity_addr *myaddr = NULL; |