Commit f106e82c authored Dec 07, 2010 by Li Zefan Committed by Chris Mason Dec 10, 2010

Btrfs: Fix a crash when mounting a subvolume



We should drop dentry before deactivating the superblock, otherwise
we can hit this bug:

BUG: Dentry f349a690{i=100,n=/} still in use (1) [unmount of btrfs loop1]
...

Steps to reproduce the bug:

  # mount /dev/loop1 /mnt
  # mkdir save
  # btrfs subvolume snapshot /mnt save/snap1
  # umount /mnt
  # mount -o subvol=save/snap1 /dev/loop1 /mnt
  (crash)

Reported-by: Michael Niederle <mniederle@gmx.at>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

parent 75eaa0e2

fs/btrfs/super.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -685,9 +685,9 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
		mutex_unlock(&root->d_inode->i_mutex);

		if (IS_ERR(new_root)) {
		dput(root);
		deactivate_locked_super(s);
		error = PTR_ERR(new_root);
		dput(root);
		goto error_free_subvol_name;
		}
		if (!new_root->d_inode) {

Admin message