From 05d31c5cb34cbdf05f9326b276be03756abb4b70 Mon Sep 17 00:00:00 2001 From: Martin Brandenburg Date: Fri, 18 Mar 2016 13:36:45 -0400 Subject: orangefs: remove needless wrapper around GFP_KERNEL Signed-off-by: Martin Brandenburg Signed-off-by: Mike Marshall --- fs/orangefs/orangefs-kernel.h | 3 --- fs/orangefs/super.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h index d85776b15176..5832168106de 100644 --- 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 eac24eb7fe80..1eeb0093b62c 100644 --- 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; -- cgit v1.2.3