diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-10 08:16:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-10 08:16:44 -0700 |
| commit | 015c21ba59fcbc522d7a9d1e0ab0f0e6c0895ff0 (patch) | |
| tree | 4fa0e91287d927e9df8e1658f93c40ca9efd60bc /fs/super.c | |
| parent | 5e48e55fb57a9026e6b3b6961def6d2aeb210659 (diff) | |
| parent | 6fcf0c72e4b9360768cf5ef543c4f14c34800ee8 (diff) | |
| download | lwn-015c21ba59fcbc522d7a9d1e0ab0f0e6c0895ff0.tar.gz lwn-015c21ba59fcbc522d7a9d1e0ab0f0e6c0895ff0.zip | |
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
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 5 |
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. */ |