projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
36f90b0
)
ceph: checking for IS_ERR instead of NULL
author
Dan Carpenter
<dan.carpenter@oracle.com>
Tue, 26 Jan 2016 09:24:44 +0000
(12:24 +0300)
committer
Ilya Dryomov
<idryomov@gmail.com>
Thu, 4 Feb 2016 17:25:08 +0000
(18:25 +0100)
ceph_osdc_alloc_request() returns NULL on error, it never returns error
pointers.
Fixes:
5be0389dac66
('ceph: re-send AIO write request when getting -EOLDSNAP error')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
fs/ceph/file.c
patch
|
blob
|
blame
|
history
diff --git
a/fs/ceph/file.c
b/fs/ceph/file.c
index 86a9c383955e56037eb38419b1e4617317d32237..7c85ddef68aba298bfdc040597a437f5b65878b8 100644
(file)
--- a/
fs/ceph/file.c
+++ b/
fs/ceph/file.c
@@
-698,8
+698,8
@@
static void ceph_aio_retry_work(struct work_struct *work)
req = ceph_osdc_alloc_request(orig_req->r_osdc, snapc, 2,
false, GFP_NOFS);
- if (
IS_ERR(req)
) {
- ret =
PTR_ERR(req)
;
+ if (
!req
) {
+ ret =
-ENOMEM
;
req = orig_req;
goto out;
}