diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 19:42:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 19:42:18 -0400 |
| commit | 97d2eb13a019ec09cc1a7ea2d3705c0b117b3c0d (patch) | |
| tree | 86f6382941f8cfc41647d33d87bec7bc1407c18c /drivers | |
| parent | 68d99b2c8efcb6ed3807a55569300c53b5f88be5 (diff) | |
| parent | 339573406737461cfb17bebabf7ba536a302d841 (diff) | |
Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client
* 'for-linus' of git://ceph.newdream.net/git/ceph-client:
libceph: fix double-free of page vector
ceph: fix 32-bit ino numbers
libceph: force resend of osd requests if we skip an osdmap
ceph: use kernel DNS resolver
ceph: fix ceph_monc_init memory leak
ceph: let the set_layout ioctl set single traits
Revert "ceph: don't truncate dirty pages in invalidate work thread"
ceph: replace leading spaces with tabs
libceph: warn on msg allocation failures
libceph: don't complain on msgpool alloc failures
libceph: always preallocate mon connection
libceph: create messenger with client
ceph: document ioctls
ceph: implement (optional) max read size
ceph: rename rsize -> rasize
ceph: make readpages fully async
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index fe3c3249cec4..65cc424359b0 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
| @@ -260,7 +260,7 @@ static struct rbd_client *rbd_client_create(struct ceph_options *opt, | |||
| 260 | kref_init(&rbdc->kref); | 260 | kref_init(&rbdc->kref); |
| 261 | INIT_LIST_HEAD(&rbdc->node); | 261 | INIT_LIST_HEAD(&rbdc->node); |
| 262 | 262 | ||
| 263 | rbdc->client = ceph_create_client(opt, rbdc); | 263 | rbdc->client = ceph_create_client(opt, rbdc, 0, 0); |
| 264 | if (IS_ERR(rbdc->client)) | 264 | if (IS_ERR(rbdc->client)) |
| 265 | goto out_rbdc; | 265 | goto out_rbdc; |
| 266 | opt = NULL; /* Now rbdc->client is responsible for opt */ | 266 | opt = NULL; /* Now rbdc->client is responsible for opt */ |