Skip to content

Commit bf3a69c

Browse files
committed
Merge tag 'for-linus-6.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs updates from Mike Marshall: "One fix, one cleanup... Fix: Julia Lawall pointed out a null pointer dereference. Cleanup: Vlastimil Babka sent me a patch to remove some SLAB related code" * tag 'for-linus-6.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: Julia Lawall reported this null pointer dereference, this should fix it. fs/orangefs: remove ORANGEFS_CACHE_CREATE_FLAGS
2 parents c5d9ab8 + 9bf93dc commit bf3a69c

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

fs/orangefs/orangefs-cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int op_cache_initialize(void)
2222
op_cache = kmem_cache_create("orangefs_op_cache",
2323
sizeof(struct orangefs_kernel_op_s),
2424
0,
25-
ORANGEFS_CACHE_CREATE_FLAGS,
25+
0,
2626
NULL);
2727

2828
if (!op_cache) {

fs/orangefs/orangefs-kernel.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,6 @@ enum orangefs_vfs_op_states {
9393
OP_VFS_STATE_GIVEN_UP = 16,
9494
};
9595

96-
/*
97-
* orangefs kernel memory related flags
98-
*/
99-
100-
#if (defined CONFIG_DEBUG_SLAB)
101-
#define ORANGEFS_CACHE_CREATE_FLAGS SLAB_RED_ZONE
102-
#else
103-
#define ORANGEFS_CACHE_CREATE_FLAGS 0
104-
#endif
105-
10696
extern const struct xattr_handler * const orangefs_xattr_handlers[];
10797

10898
extern struct posix_acl *orangefs_get_acl(struct inode *inode, int type, bool rcu);

fs/orangefs/super.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ struct dentry *orangefs_mount(struct file_system_type *fst,
527527
sb->s_fs_info = kzalloc(sizeof(struct orangefs_sb_info_s), GFP_KERNEL);
528528
if (!ORANGEFS_SB(sb)) {
529529
d = ERR_PTR(-ENOMEM);
530-
goto free_sb_and_op;
530+
goto free_op;
531531
}
532532

533533
ret = orangefs_fill_sb(sb,
@@ -644,7 +644,7 @@ int orangefs_inode_cache_initialize(void)
644644
"orangefs_inode_cache",
645645
sizeof(struct orangefs_inode_s),
646646
0,
647-
ORANGEFS_CACHE_CREATE_FLAGS,
647+
0,
648648
offsetof(struct orangefs_inode_s,
649649
link_target),
650650
sizeof_field(struct orangefs_inode_s,

0 commit comments

Comments
 (0)