X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_dev.c;h=6ba193b45d116bf923c476b95fc5dc17b6a3ee61;hb=d1b9bfc290dfafb3f7aa1b4ac92a6c01cd1f92a7;hp=44549b435bc23dafe07760a6425e09ecd96165c5;hpb=1b2547843817b4b7adbeb87ea9b070d9cac35c90;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_dev.c b/lustre/osc/osc_dev.c
index 44549b4..6ba193b 100644
--- a/lustre/osc/osc_dev.c
+++ b/lustre/osc/osc_dev.c
@@ -122,7 +122,7 @@ static void *osc_key_init(const struct lu_context *ctx,
 {
 	struct osc_thread_info *info;
 
-	OBD_SLAB_ALLOC_PTR_GFP(info, osc_thread_kmem, __GFP_IO);
+	OBD_SLAB_ALLOC_PTR_GFP(info, osc_thread_kmem, GFP_NOFS);
 	if (info == NULL)
 		info = ERR_PTR(-ENOMEM);
 	return info;
@@ -146,7 +146,7 @@ static void *osc_session_init(const struct lu_context *ctx,
 {
 	struct osc_session *info;
 
-	OBD_SLAB_ALLOC_PTR_GFP(info, osc_session_kmem, __GFP_IO);
+	OBD_SLAB_ALLOC_PTR_GFP(info, osc_session_kmem, GFP_NOFS);
 	if (info == NULL)
 		info = ERR_PTR(-ENOMEM);
 	return info;
@@ -194,7 +194,7 @@ static int osc_device_init(const struct lu_env *env, struct lu_device *d,
 static struct lu_device *osc_device_fini(const struct lu_env *env,
                                          struct lu_device *d)
 {
-        return 0;
+	return NULL;
 }
 
 static struct lu_device *osc_device_free(const struct lu_env *env,