summaryrefslogtreecommitdiff
path: root/fs/super.c
diff options
context:
space:
mode:
authorTyler Hicks <code@tyhicks.com>2021-04-19 04:39:17 +0000
committerTyler Hicks <code@tyhicks.com>2021-04-19 04:39:17 +0000
commitb7f8f259896f669f131713b0c74ba4d008daa71d (patch)
treecb42f2b5e67674b011fcca54594213f43c086e8b /fs/super.c
parent902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 (diff)
parentd434405aaab7d0ebc516b68a8fc4100922d7f5ef (diff)
downloadlwn-b7f8f259896f669f131713b0c74ba4d008daa71d.tar.gz
lwn-b7f8f259896f669f131713b0c74ba4d008daa71d.zip
Merge tag 'v5.12-rc7' into ecryptfs/next
Required to pick up idmapped mount changes which changed some function parameters.
Diffstat (limited to 'fs/super.c')
-rw-r--r--fs/super.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/super.c b/fs/super.c
index 2c6cdea2ab2d..8c1baca35c16 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -865,7 +865,8 @@ int reconfigure_super(struct fs_context *fc)
if (fc->sb_flags_mask & SB_RDONLY) {
#ifdef CONFIG_BLOCK
- if (!(fc->sb_flags & SB_RDONLY) && bdev_read_only(sb->s_bdev))
+ if (!(fc->sb_flags & SB_RDONLY) && sb->s_bdev &&
+ bdev_read_only(sb->s_bdev))
return -EACCES;
#endif
@@ -1718,12 +1719,6 @@ int freeze_super(struct super_block *sb)
}
EXPORT_SYMBOL(freeze_super);
-/**
- * thaw_super -- unlock filesystem
- * @sb: the super to thaw
- *
- * Unlocks the filesystem and marks it writeable again after freeze_super().
- */
static int thaw_super_locked(struct super_block *sb)
{
int error;
@@ -1759,6 +1754,12 @@ out:
return 0;
}
+/**
+ * thaw_super -- unlock filesystem
+ * @sb: the super to thaw
+ *
+ * Unlocks the filesystem and marks it writeable again after freeze_super().
+ */
int thaw_super(struct super_block *sb)
{
down_write(&sb->s_umount);