vfs: function to prevent re-use of block-device-based superblocks

The function is to be called from filesystem-specific code to mark a
superblock to be ignored by superblock test and thus never re-used.  The
function also unregisters bdi if the bdi is per-superblock to avoid
collision if a new superblock is created to represent the filesystem.
generic_shutdown_super() skips unregistering bdi for a retired superlock as
it assumes retire function has already done it.

This patch adds the functionality only for the block-device-based supers,
since the primary use case of the feature is to gracefully handle force
unmount of external devices, mounted with FUSE.  This can be further
extended to cover all superblocks, if the need arises.

Signed-off-by: Daniil Lunev <dlunev@chromium.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/super.c b/fs/super.c
index 60f57c7bc0a69a0cb931a957c354ed740aaba9f0..258d9257b0a727b13f713ee70de52b1143fb057f 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -422,6 +422,35 @@ bool trylock_super(struct super_block *sb)
        return false;
 }
 
+/**
+ *     retire_super    -       prevents superblock from being reused
+ *     @sb: superblock to retire
+ *
+ *     The function marks superblock to be ignored in superblock test, which
+ *     prevents it from being reused for any new mounts.  If the superblock has
+ *     a private bdi, it also unregisters it, but doesn't reduce the refcount
+ *     of the superblock to prevent potential races.  The refcount is reduced
+ *     by generic_shutdown_super().  The function can not be called
+ *     concurrently with generic_shutdown_super().  It is safe to call the
+ *     function multiple times, subsequent calls have no effect.
+ *
+ *     The marker will affect the re-use only for block-device-based
+ *     superblocks.  Other superblocks will still get marked if this function
+ *     is used, but that will not affect their reusability.
+ */
+void retire_super(struct super_block *sb)
+{
+       WARN_ON(!sb->s_bdev);
+       down_write(&sb->s_umount);
+       if (sb->s_iflags & SB_I_PERSB_BDI) {
+               bdi_unregister(sb->s_bdi);
+               sb->s_iflags &= ~SB_I_PERSB_BDI;
+       }
+       sb->s_iflags |= SB_I_RETIRED;
+       up_write(&sb->s_umount);
+}
+EXPORT_SYMBOL(retire_super);
+
 /**
  *     generic_shutdown_super  -       common helper for ->kill_sb()
  *     @sb: superblock to kill
@@ -1216,7 +1245,7 @@ static int set_bdev_super_fc(struct super_block *s, struct fs_context *fc)
 
 static int test_bdev_super_fc(struct super_block *s, struct fs_context *fc)
 {
-       return s->s_bdev == fc->sget_key;
+       return !(s->s_iflags & SB_I_RETIRED) && s->s_bdev == fc->sget_key;
 }
 
 /**
@@ -1307,7 +1336,7 @@ EXPORT_SYMBOL(get_tree_bdev);
 
 static int test_bdev_super(struct super_block *s, void *data)
 {
-       return (void *)s->s_bdev == data;
+       return !(s->s_iflags & SB_I_RETIRED) && (void *)s->s_bdev == data;
 }
 
 struct dentry *mount_bdev(struct file_system_type *fs_type,

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9ad5e3520fae577c2a216859aba20f8d26241172..246120ee05733e0b456f91cecb0466066264261e 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1412,6 +1412,7 @@ extern int send_sigurg(struct fown_struct *fown);
 #define SB_I_SKIP_SYNC 0x00000100      /* Skip superblock at global sync */
 #define SB_I_PERSB_BDI 0x00000200      /* has a per-sb bdi */
 #define SB_I_TS_EXPIRY_WARNED 0x00000400 /* warned about timestamp range expiry */
+#define SB_I_RETIRED   0x00000800      /* superblock shouldn't be reused */
 
 /* Possible states of 'frozen' field */
 enum {
@@ -2432,6 +2433,7 @@ extern struct dentry *mount_nodev(struct file_system_type *fs_type,
        int flags, void *data,
        int (*fill_super)(struct super_block *, void *, int));
 extern struct dentry *mount_subtree(struct vfsmount *mnt, const char *path);
+void retire_super(struct super_block *sb);
 void generic_shutdown_super(struct super_block *sb);
 void kill_block_super(struct super_block *sb);
 void kill_anon_super(struct super_block *sb);