b=20668

[fs/lustre-release.git] / lustre / llite / vvp_dev.c

diff --git a/lustre/llite/vvp_dev.c b/lustre/llite/vvp_dev.c
index 8347789..6549139 100644 (file)
--- a/lustre/llite/vvp_dev.c
+++ b/lustre/llite/vvp_dev.c
@@ -89,7 +89,7 @@ static void *vvp_key_init(const struct lu_context *ctx,
 {
         struct vvp_thread_info *info;
 
-        OBD_SLAB_ALLOC_PTR(info, vvp_thread_kmem);
+        OBD_SLAB_ALLOC_PTR_GFP(info, vvp_thread_kmem, CFS_ALLOC_IO);
         if (info == NULL)
                 info = ERR_PTR(-ENOMEM);
         return info;
@@ -107,7 +107,7 @@ static void *vvp_session_key_init(const struct lu_context *ctx,
 {
         struct vvp_session *session;
 
-        OBD_SLAB_ALLOC_PTR(session, vvp_session_kmem);
+        OBD_SLAB_ALLOC_PTR_GFP(session, vvp_session_kmem, CFS_ALLOC_IO);
         if (session == NULL)
                 session = ERR_PTR(-ENOMEM);
         return session;
@@ -404,7 +404,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
                 seq_printf(seq, "%s"#flag, has_flags ? "|" : "");       \
                 has_flags = 1;                                          \
         }                                                               \
-} while(0);
+} while(0)
 
 static void vvp_pgcache_page_show(const struct lu_env *env,
                                   struct seq_file *seq, struct cl_page *page)