diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:22:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:22:20 -0700 |
| commit | bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f (patch) | |
| tree | b88b57915ccc335cb1391abf3da5fa59bd5e6ac5 /drivers | |
| parent | 1c08232cfe5e68c6234305a3abb64d52d89c9ead (diff) | |
| parent | fca65b4ad72d28cbb43a029114d04b89f06faadb (diff) | |
| download | kernel_samsung_smdk4412-bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f.zip kernel_samsung_smdk4412-bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f.tar.gz kernel_samsung_smdk4412-bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f.tar.bz2 | |
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:
ceph: do not call __mark_dirty_inode under i_lock
libceph: fix ceph_osdc_alloc_request error checks
ceph: handle ceph_osdc_new_request failure in ceph_writepages_start
libceph: fix ceph_msg_new error path
ceph: use ihold() when i_lock is held
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 16dc364..3e90471 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -777,9 +777,9 @@ static int rbd_do_request(struct request *rq, ops, false, GFP_NOIO, pages, bio); - if (IS_ERR(req)) { + if (!req) { up_read(&header->snap_rwsem); - ret = PTR_ERR(req); + ret = -ENOMEM; goto done_pages; } |