5 files changed, 16 insertions, 35 deletions

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index c04ef1d4f18a..97aff2879cda 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -254,6 +254,7 @@ static char *scanarg(char *s, char del)
                                 return NULL;
                 }
         }
+        s[-1] ='\0';
         return s;
 }
 
@@ -378,8 +379,7 @@ static Node *create_entry(const char __user *buffer, size_t count)
                 p = scanarg(p, del);
                 if (!p)
                         goto einval;
-                p[-1] = '\0';
-                if (p == e->magic)
+                if (!e->magic[0])
                         goto einval;
                 if (USE_DEBUG)
                         print_hex_dump_bytes(
@@ -391,8 +391,7 @@ static Node *create_entry(const char __user *buffer, size_t count)
                 p = scanarg(p, del);
                 if (!p)
                         goto einval;
-                p[-1] = '\0';
-                if (p == e->mask) {
+                if (!e->mask[0]) {
                         e->mask = NULL;
                         pr_debug("register:  mask[raw]: none\n");
                 } else if (USE_DEBUG)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 0144790e296e..50c5a8762aed 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1485,7 +1485,7 @@ static void update_dev_time(char *path_name)
         struct file *filp;
 
         filp = filp_open(path_name, O_RDWR, 0);
-        if (!filp)
+        if (IS_ERR(filp))
                 return;
         file_update_time(filp);
         filp_close(filp, NULL);
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 503ea15dc5db..370420bfae8d 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -267,7 +267,6 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
         handle_t *handle;
         ext4_lblk_t orig_blk_offset, donor_blk_offset;
         unsigned long blocksize = orig_inode->i_sb->s_blocksize;
-        unsigned int w_flags = 0;
         unsigned int tmp_data_size, data_size, replaced_size;
         int err2, jblocks, retries = 0;
         int replaced_count = 0;
@@ -288,9 +287,6 @@ again:
                 return 0;
         }
 
-        if (segment_eq(get_fs(), KERNEL_DS))
-                w_flags |= AOP_FLAG_UNINTERRUPTIBLE;
-
         orig_blk_offset = orig_page_offset * blocks_per_page +
                 data_offset_in_page;
 
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 697390ea47b8..ddc9f9612f16 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -448,27 +448,6 @@ static struct mempolicy *kernfs_vma_get_policy(struct vm_area_struct *vma,
         return pol;
 }
 
-static int kernfs_vma_migrate(struct vm_area_struct *vma,
-                              const nodemask_t *from, const nodemask_t *to,
-                              unsigned long flags)
-{
-        struct file *file = vma->vm_file;
-        struct kernfs_open_file *of = kernfs_of(file);
-        int ret;
-
-        if (!of->vm_ops)
-                return 0;
-
-        if (!kernfs_get_active(of->kn))
-                return 0;
-
-        ret = 0;
-        if (of->vm_ops->migrate)
-                ret = of->vm_ops->migrate(vma, from, to, flags);
-
-        kernfs_put_active(of->kn);
-        return ret;
-}
 #endif
 
 static const struct vm_operations_struct kernfs_vm_ops = {
@@ -479,7 +458,6 @@ static const struct vm_operations_struct kernfs_vm_ops = {
 #ifdef CONFIG_NUMA
         .set_policy     = kernfs_vma_set_policy,
         .get_policy     = kernfs_vma_get_policy,
-        .migrate        = kernfs_vma_migrate,
 #endif
 };
 
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 73ca1740d839..0f96f71ab32b 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -91,6 +91,7 @@ static void show_type(struct seq_file *m, struct super_block *sb)
 
 static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
 {
+        struct proc_mounts *p = proc_mounts(m);
         struct mount *r = real_mount(mnt);
         int err = 0;
         struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
@@ -104,7 +105,10 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
                 mangle(m, r->mnt_devname ? r->mnt_devname : "none");
         }
         seq_putc(m, ' ');
-        seq_path(m, &mnt_path, " \t\n\\");
+        /* mountpoints outside of chroot jail will give SEQ_SKIP on this */
+        err = seq_path_root(m, &mnt_path, &p->root, " \t\n\\");
+        if (err)
+                goto out;
         seq_putc(m, ' ');
         show_type(m, sb);
         seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
@@ -125,7 +129,6 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
         struct mount *r = real_mount(mnt);
         struct super_block *sb = mnt->mnt_sb;
         struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
-        struct path root = p->root;
         int err = 0;
 
         seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
@@ -139,7 +142,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
         seq_putc(m, ' ');
 
         /* mountpoints outside of chroot jail will give SEQ_SKIP on this */
-        err = seq_path_root(m, &mnt_path, &root, " \t\n\\");
+        err = seq_path_root(m, &mnt_path, &p->root, " \t\n\\");
         if (err)
                 goto out;
 
@@ -182,6 +185,7 @@ out:
 
 static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
 {
+        struct proc_mounts *p = proc_mounts(m);
         struct mount *r = real_mount(mnt);
         struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
         struct super_block *sb = mnt_path.dentry->d_sb;
@@ -201,7 +205,10 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
 
         /* mount point */
         seq_puts(m, " mounted on ");
-        seq_path(m, &mnt_path, " \t\n\\");
+        /* mountpoints outside of chroot jail will give SEQ_SKIP on this */
+        err = seq_path_root(m, &mnt_path, &p->root, " \t\n\\");
+        if (err)
+                goto out;
         seq_putc(m, ' ');
 
         /* file system type */
@@ -216,6 +223,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
         }
 
         seq_putc(m, '\n');
+out:
         return err;
 }