Commit bf3a69c6 authored Mar 18, 2024 by Linus Torvalds

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

parents c5d9ab85 9bf93dcf

fs/orangefs/orangefs-cache.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ int op_cache_initialize(void)
		op_cache = kmem_cache_create("orangefs_op_cache",
		sizeof(struct orangefs_kernel_op_s),
		0,
		ORANGEFS_CACHE_CREATE_FLAGS,
		0,
		NULL);

		if (!op_cache) {

fs/orangefs/orangefs-kernel.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -93,16 +93,6 @@ enum orangefs_vfs_op_states {
		OP_VFS_STATE_GIVEN_UP = 16,
		};

		/*
		* orangefs kernel memory related flags
		*/

		#if (defined CONFIG_DEBUG_SLAB)
		#define ORANGEFS_CACHE_CREATE_FLAGS SLAB_RED_ZONE
		#else
		#define ORANGEFS_CACHE_CREATE_FLAGS 0
		#endif

		extern const struct xattr_handler * const orangefs_xattr_handlers[];

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

fs/orangefs/super.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -527,7 +527,7 @@ struct dentry orangefs_mount(struct file_system_type fst,
		sb->s_fs_info = kzalloc(sizeof(struct orangefs_sb_info_s), GFP_KERNEL);
		if (!ORANGEFS_SB(sb)) {
		d = ERR_PTR(-ENOMEM);
		goto free_sb_and_op;
		goto free_op;
		}

		ret = orangefs_fill_sb(sb,
		@@ -644,7 +644,7 @@ int orangefs_inode_cache_initialize(void)
		"orangefs_inode_cache",
		sizeof(struct orangefs_inode_s),
		0,
		ORANGEFS_CACHE_CREATE_FLAGS,
		0,
		offsetof(struct orangefs_inode_s,
		link_target),
		sizeof_field(struct orangefs_inode_s,