diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 15:11:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 15:11:13 -0500 |
| commit | c292fe4aae5aa5c089633bc40342d27c8275306a (patch) | |
| tree | 84c6898327eb35c3c20c1728eaff8ca19094ddeb /net/ceph | |
| parent | 7758c4d6e9371efa04a1cf1b124bbf9cc43e830e (diff) | |
| parent | 224736d9113ab4a7cf3f05c05377492bd99b4b02 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: Allocate larger oid buffer in request msgs
ceph: initialize root dentry
ceph: fix iput race when queueing inode work
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osd_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 733e46008b89..f4f3f58f5234 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
| @@ -244,7 +244,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, | |||
| 244 | ceph_pagelist_init(req->r_trail); | 244 | ceph_pagelist_init(req->r_trail); |
| 245 | } | 245 | } |
| 246 | /* create request message; allow space for oid */ | 246 | /* create request message; allow space for oid */ |
| 247 | msg_size += 40; | 247 | msg_size += MAX_OBJ_NAME_SIZE; |
| 248 | if (snapc) | 248 | if (snapc) |
| 249 | msg_size += sizeof(u64) * snapc->num_snaps; | 249 | msg_size += sizeof(u64) * snapc->num_snaps; |
| 250 | if (use_mempool) | 250 | if (use_mempool) |