From: Dan Carpenter Date: Tue, 26 Jan 2016 09:24:44 +0000 (+0300) Subject: ceph: checking for IS_ERR instead of NULL X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1418bf076d08edd47a610ea3844c6f6012949a51;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Ilya Dryomov --- diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 86a9c383955e..7c85ddef68ab 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; }