orangefs: remove needless wrapper around GFP_KERNEL

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index d85776b..5832168 100644 (file)
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -120,9 +120,6 @@ struct client_debug_mask {
 #define ORANGEFS_CACHE_CREATE_FLAGS 0
 #endif /* ((defined ORANGEFS_KERNEL_DEBUG) && (defined CONFIG_DEBUG_SLAB)) */
 
-#define ORANGEFS_GFP_FLAGS (GFP_KERNEL)
-#define ORANGEFS_BUFMAP_GFP_FLAGS (GFP_KERNEL)
-
 /* orangefs xattr and acl related defines */
 #define ORANGEFS_XATTR_INDEX_POSIX_ACL_ACCESS  1
 #define ORANGEFS_XATTR_INDEX_POSIX_ACL_DEFAULT 2

diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index eac24eb..1eeb009 100644 (file)
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -360,8 +360,7 @@ static int orangefs_fill_sb(struct super_block *sb,
        struct orangefs_object_kref root_object;
 
        /* alloc and init our private orangefs sb info */
-       sb->s_fs_info =
-               kzalloc(sizeof(struct orangefs_sb_info_s), ORANGEFS_GFP_FLAGS);
+       sb->s_fs_info = kzalloc(sizeof(struct orangefs_sb_info_s), GFP_KERNEL);
        if (!ORANGEFS_SB(sb))
                return -ENOMEM;
        ORANGEFS_SB(sb)->sb = sb;