Commit 76fcef19 authored by David Woodhouse's avatar David Woodhouse Committed by Chris Mason

Btrfs: Reinstate '-osubvol=.' option to mount entire tree

Date: Tue, 19 Aug 2008 16:49:35 +0100
This disappeared when I removed the special case for '.' in btrfs_lookup()
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 87acb4ef
...@@ -451,21 +451,25 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, ...@@ -451,21 +451,25 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
s->s_flags |= MS_ACTIVE; s->s_flags |= MS_ACTIVE;
} }
mutex_lock(&s->s_root->d_inode->i_mutex); if (!strcmp(subvol_name, "."))
root = lookup_one_len(subvol_name, s->s_root, strlen(subvol_name)); root = dget(s->s_root);
mutex_unlock(&s->s_root->d_inode->i_mutex); else {
if (IS_ERR(root)) { mutex_lock(&s->s_root->d_inode->i_mutex);
up_write(&s->s_umount); root = lookup_one_len(subvol_name, s->s_root, strlen(subvol_name));
deactivate_super(s); mutex_unlock(&s->s_root->d_inode->i_mutex);
error = PTR_ERR(root); if (IS_ERR(root)) {
goto error; up_write(&s->s_umount);
} deactivate_super(s);
if (!root->d_inode) { error = PTR_ERR(root);
dput(root); goto error;
up_write(&s->s_umount); }
deactivate_super(s); if (!root->d_inode) {
error = -ENXIO; dput(root);
goto error; up_write(&s->s_umount);
deactivate_super(s);
error = -ENXIO;
goto error;
}
} }
mnt->mnt_sb = s; mnt->mnt_sb = s;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment