X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_io.c;h=5778a4bca2c6758d6b00c493a02187836cd1b86c;hb=f2a404d1fec2287ef9ffda105727e8cd3f8e0b7b;hp=87245204a50e70be58b63f5f0914318d1f1a8417;hpb=342c14842fa996181e5d5764701585b1b2f6d6cb;p=fs%2Flustre-release.git diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c index 8724520..5778a4b 100644 --- a/lustre/osc/osc_io.c +++ b/lustre/osc/osc_io.c @@ -864,18 +864,18 @@ int osc_io_init(const struct lu_env *env, } int osc_req_init(const struct lu_env *env, struct cl_device *dev, - struct cl_req *req) + struct cl_req *req) { - struct osc_req *or; - int result; - - OBD_SLAB_ALLOC_PTR_GFP(or, osc_req_kmem, __GFP_IO); - if (or != NULL) { - cl_req_slice_add(req, &or->or_cl, dev, &osc_req_ops); - result = 0; - } else - result = -ENOMEM; - return result; + struct osc_req *or; + int result; + + OBD_SLAB_ALLOC_PTR_GFP(or, osc_req_kmem, GFP_NOFS); + if (or != NULL) { + cl_req_slice_add(req, &or->or_cl, dev, &osc_req_ops); + result = 0; + } else + result = -ENOMEM; + return result; } /** @} osc */