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. -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEIGSFVdO6eop9nER2z0QOqevODb4FAmXSUcsACgkQz0QOqevO Db5VmxAAiQlsxX2Ki3q00rMgaXFS4yTwSPsGsTrC5eQlyJfq4xEGMTWJGjjRS56k L2FGioP7OmIlo2VrzCc9Ms4ve/NyQjXpaoDMnsEUWSUfd8OHSJkBrpeVUWWfcHHk zLEmxNb2AETcJupAgoJOWOoSb59ggCKpCqmLezYoSZmlnb9qg6lhFbnWtkVC6q+p AREOfByoLIrJUtVh4Bmexo4nO5w3F84cfAV2WAmLMnXKjGnyFLGkqQvy8yXW0sA1 hsZW+VjmoRaCG78M6OX+Sl3ok0V8i2AcOkguWPj+dkCPb8XLkxhGwjnqLziJ54Z5 aFrtSzeZiNQOqy7b6cj6+x2KcWE5FhphAKjX/psEZrZNa0e6ZvNfby3yJ4TzNWaN eajtOtcq+Ec9IruWXt/WCsm0zYwW1HumUhga5QCHjQRRjOt36ua4QC02iCx2sYuX SBnsBCgQo1xxAta3uOMj2sG38lUwYoH0U5wlPsqrGh1nsbGbc49Ok7BYX/wWF8os CYnT5t2KR9yUvblV+dH9XTj2EwqgINMRYBW7uBjZqY9gq2v/RKrtQCjnedAAA+yx B6UUob/naV5VpXfhwpXiw2oJrQy/kqQuwOEcgY/a6cwmENd9RuwGXBiBI6hrAOzl ftxiUcByW8/hS13G04qJ7pGTACs4njteMvvg+Y68nWUmPWMZTio= =/gAC -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
bf3a69c686
|
@ -22,7 +22,7 @@ int op_cache_initialize(void)
|
||||||
op_cache = kmem_cache_create("orangefs_op_cache",
|
op_cache = kmem_cache_create("orangefs_op_cache",
|
||||||
sizeof(struct orangefs_kernel_op_s),
|
sizeof(struct orangefs_kernel_op_s),
|
||||||
0,
|
0,
|
||||||
ORANGEFS_CACHE_CREATE_FLAGS,
|
0,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
if (!op_cache) {
|
if (!op_cache) {
|
||||||
|
|
|
@ -93,16 +93,6 @@ enum orangefs_vfs_op_states {
|
||||||
OP_VFS_STATE_GIVEN_UP = 16,
|
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 const struct xattr_handler * const orangefs_xattr_handlers[];
|
||||||
|
|
||||||
extern struct posix_acl *orangefs_get_acl(struct inode *inode, int type, bool rcu);
|
extern struct posix_acl *orangefs_get_acl(struct inode *inode, int type, bool rcu);
|
||||||
|
|
|
@ -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);
|
sb->s_fs_info = kzalloc(sizeof(struct orangefs_sb_info_s), GFP_KERNEL);
|
||||||
if (!ORANGEFS_SB(sb)) {
|
if (!ORANGEFS_SB(sb)) {
|
||||||
d = ERR_PTR(-ENOMEM);
|
d = ERR_PTR(-ENOMEM);
|
||||||
goto free_sb_and_op;
|
goto free_op;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = orangefs_fill_sb(sb,
|
ret = orangefs_fill_sb(sb,
|
||||||
|
@ -644,7 +644,7 @@ int orangefs_inode_cache_initialize(void)
|
||||||
"orangefs_inode_cache",
|
"orangefs_inode_cache",
|
||||||
sizeof(struct orangefs_inode_s),
|
sizeof(struct orangefs_inode_s),
|
||||||
0,
|
0,
|
||||||
ORANGEFS_CACHE_CREATE_FLAGS,
|
0,
|
||||||
offsetof(struct orangefs_inode_s,
|
offsetof(struct orangefs_inode_s,
|
||||||
link_target),
|
link_target),
|
||||||
sizeof_field(struct orangefs_inode_s,
|
sizeof_field(struct orangefs_inode_s,
|
||||||
|
|
Loading…
Reference in New Issue