diff options
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 6 | 
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 66c4f7e781cb..2e10cb19c5b0 100644 --- a/fs/namespace.c +++ b/fs/namespace.c  | |||
| @@ -788,7 +788,6 @@ static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt) | |||
| 788 | { MNT_NOATIME, ",noatime" }, | 788 | { MNT_NOATIME, ",noatime" }, | 
| 789 | { MNT_NODIRATIME, ",nodiratime" }, | 789 | { MNT_NODIRATIME, ",nodiratime" }, | 
| 790 | { MNT_RELATIME, ",relatime" }, | 790 | { MNT_RELATIME, ",relatime" }, | 
| 791 | { MNT_STRICTATIME, ",strictatime" }, | ||
| 792 | { 0, NULL } | 791 | { 0, NULL } | 
| 793 | }; | 792 | }; | 
| 794 | const struct proc_fs_info *fs_infop; | 793 | const struct proc_fs_info *fs_infop; | 
| @@ -2213,10 +2212,7 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, | |||
| 2213 | goto out1; | 2212 | goto out1; | 
| 2214 | } | 2213 | } | 
| 2215 | 2214 | ||
| 2216 | read_lock(¤t->fs->lock); | 2215 | get_fs_root(current->fs, &root); | 
| 2217 | root = current->fs->root; | ||
| 2218 | path_get(¤t->fs->root); | ||
| 2219 | read_unlock(¤t->fs->lock); | ||
| 2220 | down_write(&namespace_sem); | 2216 | down_write(&namespace_sem); | 
| 2221 | mutex_lock(&old.dentry->d_inode->i_mutex); | 2217 | mutex_lock(&old.dentry->d_inode->i_mutex); | 
| 2222 | error = -EINVAL; | 2218 | error = -EINVAL; | 
