浏览代码

orangefs: remove needless wrapper around GFP_KERNEL

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Martin Brandenburg 9 年之前
父节点
当前提交
05d31c5cb3
共有 2 个文件被更改,包括 1 次插入5 次删除
  1. 0 3
      fs/orangefs/orangefs-kernel.h
  2. 1 2
      fs/orangefs/super.c

+ 0 - 3
fs/orangefs/orangefs-kernel.h

@@ -120,9 +120,6 @@ struct client_debug_mask {
 #define ORANGEFS_CACHE_CREATE_FLAGS 0
 #define ORANGEFS_CACHE_CREATE_FLAGS 0
 #endif /* ((defined ORANGEFS_KERNEL_DEBUG) && (defined CONFIG_DEBUG_SLAB)) */
 #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 */
 /* orangefs xattr and acl related defines */
 #define ORANGEFS_XATTR_INDEX_POSIX_ACL_ACCESS  1
 #define ORANGEFS_XATTR_INDEX_POSIX_ACL_ACCESS  1
 #define ORANGEFS_XATTR_INDEX_POSIX_ACL_DEFAULT 2
 #define ORANGEFS_XATTR_INDEX_POSIX_ACL_DEFAULT 2

+ 1 - 2
fs/orangefs/super.c

@@ -360,8 +360,7 @@ static int orangefs_fill_sb(struct super_block *sb,
 	struct orangefs_object_kref root_object;
 	struct orangefs_object_kref root_object;
 
 
 	/* alloc and init our private orangefs sb info */
 	/* 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))
 	if (!ORANGEFS_SB(sb))
 		return -ENOMEM;
 		return -ENOMEM;
 	ORANGEFS_SB(sb)->sb = sb;
 	ORANGEFS_SB(sb)->sb = sb;