summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-01-26 12:24:44 +0300
committerIlya Dryomov <idryomov@gmail.com>2016-02-04 18:25:08 +0100
commit1418bf076d08edd47a610ea3844c6f6012949a51 (patch)
tree94adc36a2fbc50aa8bdd82c2e8f4c89f696b6c91 /fs
parent36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 (diff)
downloadop-kernel-dev-1418bf076d08edd47a610ea3844c6f6012949a51.zip
op-kernel-dev-1418bf076d08edd47a610ea3844c6f6012949a51.tar.gz
ceph: checking for IS_ERR instead of NULL
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 86a9c38..7c85dde 100644
--- 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;
}
OpenPOWER on IntegriCloud