Merge tag 'for-linus-5.16-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull orangefs fixes from Mike Marshall:

 - fix sb refcount leak when allocate sb info failed (Chenyuan Mi)

 - fix error return code of orangefs_revalidate_lookup() (Jia-Ju Bai)

 - remove redundant initialization of variable ret (Colin Ian King)

* tag 'for-linus-5.16-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: Fix sb refcount leak when allocate sb info failed.
  fs: orangefs: fix error return code of orangefs_revalidate_lookup()
  orangefs: Remove redundant initialization of variable ret

diff --combined fs/orangefs/super.c
index 8bb0a53a658b061b4dc0dc5c47fa191c660ce038,18341cde3f34e364ee96328567db04999fc7623d..d90d8addbfc29ee45b8b571e6324f792162886de
--- 1/fs/orangefs/super.c
--- 2/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@@ -11,7 -11,6 +11,7 @@@
  
  #include <linux/parser.h>
  #include <linux/hashtable.h>
 +#include <linux/seq_file.h>
  
  /* a cache for orangefs-inode objects (i.e. orangefs inode private data) */
  static struct kmem_cache *orangefs_inode_cache;
@@@ -476,7 -475,7 +476,7 @@@ struct dentry *orangefs_mount(struct fi
                           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);
@@@ -527,7 -526,7 +527,7 @@@
        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,