From 507874c08f633e05f3043c618af0705e0a750e4c Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Fri, 10 Sep 2021 13:25:34 +0100 Subject: orangefs: Remove redundant initialization of variable ret The variable ret is being initialized with a value that is never read, it is being updated later on. The assignment is redundant and can be removed. Addresses-Coverity: ("Unused value") Signed-off-by: Colin Ian King Signed-off-by: Mike Marshall --- fs/orangefs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs/orangefs/super.c') diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 2f2e430461b2..897fb6c3f161 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -475,7 +475,7 @@ struct dentry *orangefs_mount(struct file_system_type *fst, const char *devname, void *data) { - int ret = -EINVAL; + int ret; struct super_block *sb = ERR_PTR(-EINVAL); struct orangefs_kernel_op_s *new_op; struct dentry *d = ERR_PTR(-EINVAL); -- cgit v1.2.3 From ac2c63757f4f413980d6c676dbe1ae2941b94afa Mon Sep 17 00:00:00 2001 From: Chenyuan Mi Date: Tue, 7 Sep 2021 19:41:05 +0800 Subject: orangefs: Fix sb refcount leak when allocate sb info failed. The reference counting issue happens in one exception handling path of orangefs_mount(). When failing to allocate sb info, the function forgets to decrease the refcount of sb increased by sget(), causing a refcount leak. Fix this issue by jumping to the label "free_sb_and_op" instead of "free_op" Signed-off-by: Chenyuan Mi Signed-off-by: Xiyu Yang Signed-off-by: Xin Tan Signed-off-by: Mike Marshall --- fs/orangefs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs/orangefs/super.c') diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 897fb6c3f161..18341cde3f34 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -526,7 +526,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_op; + goto free_sb_and_op; } ret = orangefs_fill_sb(sb, -- cgit v1.2.3