diff options
author | Martin Brandenburg <martin@omnibond.com> | 2016-03-18 13:36:45 -0400 |
---|---|---|
committer | Mike Marshall <hubcap@omnibond.com> | 2016-03-23 17:36:15 -0400 |
commit | 05d31c5cb34cbdf05f9326b276be03756abb4b70 (patch) | |
tree | 837b869658aa0e8fd283b8728e7e5775d42921ef | |
parent | 93d53a488571fb8f8ceaba09352dcf4dfa1fc4e0 (diff) |
orangefs: remove needless wrapper around GFP_KERNEL
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
-rw-r--r-- | fs/orangefs/orangefs-kernel.h | 3 | ||||
-rw-r--r-- | fs/orangefs/super.c | 3 |
2 files changed, 1 insertions, 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 { | |||
120 | #define ORANGEFS_CACHE_CREATE_FLAGS 0 | 120 | #define ORANGEFS_CACHE_CREATE_FLAGS 0 |
121 | #endif /* ((defined ORANGEFS_KERNEL_DEBUG) && (defined CONFIG_DEBUG_SLAB)) */ | 121 | #endif /* ((defined ORANGEFS_KERNEL_DEBUG) && (defined CONFIG_DEBUG_SLAB)) */ |
122 | 122 | ||
123 | #define ORANGEFS_GFP_FLAGS (GFP_KERNEL) | ||
124 | #define ORANGEFS_BUFMAP_GFP_FLAGS (GFP_KERNEL) | ||
125 | |||
126 | /* orangefs xattr and acl related defines */ | 123 | /* orangefs xattr and acl related defines */ |
127 | #define ORANGEFS_XATTR_INDEX_POSIX_ACL_ACCESS 1 | 124 | #define ORANGEFS_XATTR_INDEX_POSIX_ACL_ACCESS 1 |
128 | #define ORANGEFS_XATTR_INDEX_POSIX_ACL_DEFAULT 2 | 125 | #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, | |||
360 | struct orangefs_object_kref root_object; | 360 | struct orangefs_object_kref root_object; |
361 | 361 | ||
362 | /* alloc and init our private orangefs sb info */ | 362 | /* alloc and init our private orangefs sb info */ |
363 | sb->s_fs_info = | 363 | sb->s_fs_info = kzalloc(sizeof(struct orangefs_sb_info_s), GFP_KERNEL); |
364 | kzalloc(sizeof(struct orangefs_sb_info_s), ORANGEFS_GFP_FLAGS); | ||
365 | if (!ORANGEFS_SB(sb)) | 364 | if (!ORANGEFS_SB(sb)) |
366 | return -ENOMEM; | 365 | return -ENOMEM; |
367 | ORANGEFS_SB(sb)->sb = sb; | 366 | ORANGEFS_SB(sb)->sb = sb; |