Merge branch 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull mount fixes from Al Viro:
 "A couple of regressions from the mount series"

* 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: add missing blkdev_put() in get_tree_bdev()
  shmem: fix LSM options parsing

1 files changed, 4 insertions, 1 deletions

diff --git a/fs/super.c b/fs/super.c
index f627b7c53d2b..cfadab2cbf35 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -1300,6 +1300,7 @@ int get_tree_bdev(struct fs_context *fc,
         mutex_lock(&bdev->bd_fsfreeze_mutex);
         if (bdev->bd_fsfreeze_count > 0) {
                 mutex_unlock(&bdev->bd_fsfreeze_mutex);
+                blkdev_put(bdev, mode);
                 warnf(fc, "%pg: Can't mount, blockdev is frozen", bdev);
                 return -EBUSY;
         }
@@ -1308,8 +1309,10 @@ int get_tree_bdev(struct fs_context *fc,
         fc->sget_key = bdev;
         s = sget_fc(fc, test_bdev_super_fc, set_bdev_super_fc);
         mutex_unlock(&bdev->bd_fsfreeze_mutex);
-        if (IS_ERR(s))
+        if (IS_ERR(s)) {
+                blkdev_put(bdev, mode);
                 return PTR_ERR(s);
+        }
 
         if (s->s_root) {
                 /* Don't summarily change the RO/RW state. */