14 files changed, 53 insertions, 80 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/ctree.h b/fs/btrfs/ctree.h
index e6fbbd74b716..7e607416755a 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3481,8 +3481,8 @@ void btrfs_put_block_group_cache(struct btrfs_fs_info *info);
 u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo);
 int btrfs_error_unpin_extent_range(struct btrfs_root *root,
                                    u64 start, u64 end);
-int btrfs_error_discard_extent(struct btrfs_root *root, u64 bytenr,
-                               u64 num_bytes, u64 *actual_bytes);
+int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
+                         u64 num_bytes, u64 *actual_bytes);
 int btrfs_force_chunk_alloc(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root, u64 type);
 int btrfs_trim_fs(struct btrfs_root *root, struct fstrim_range *range);
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 30965120772b..8c63419a7f70 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4121,12 +4121,6 @@ again:
                 if (ret)
                         break;
 
-                /* opt_discard */
-                if (btrfs_test_opt(root, DISCARD))
-                        ret = btrfs_error_discard_extent(root, start,
-                                                         end + 1 - start,
-                                                         NULL);
-
                 clear_extent_dirty(unpin, start, end, GFP_NOFS);
                 btrfs_error_unpin_extent_range(root, start, end);
                 cond_resched();
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 222d6aea4a8a..a80b97100d90 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1889,8 +1889,8 @@ static int btrfs_issue_discard(struct block_device *bdev,
         return blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_NOFS, 0);
 }
 
-static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
-                                u64 num_bytes, u64 *actual_bytes)
+int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
+                         u64 num_bytes, u64 *actual_bytes)
 {
         int ret;
         u64 discarded_bytes = 0;
@@ -5727,7 +5727,8 @@ void btrfs_prepare_extent_commit(struct btrfs_trans_handle *trans,
         update_global_block_rsv(fs_info);
 }
 
-static int unpin_extent_range(struct btrfs_root *root, u64 start, u64 end)
+static int unpin_extent_range(struct btrfs_root *root, u64 start, u64 end,
+                              const bool return_free_space)
 {
         struct btrfs_fs_info *fs_info = root->fs_info;
         struct btrfs_block_group_cache *cache = NULL;
@@ -5751,7 +5752,8 @@ static int unpin_extent_range(struct btrfs_root *root, u64 start, u64 end)
 
                 if (start < cache->last_byte_to_unpin) {
                         len = min(len, cache->last_byte_to_unpin - start);
-                        btrfs_add_free_space(cache, start, len);
+                        if (return_free_space)
+                                btrfs_add_free_space(cache, start, len);
                 }
 
                 start += len;
@@ -5815,7 +5817,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
                                                    end + 1 - start, NULL);
 
                 clear_extent_dirty(unpin, start, end, GFP_NOFS);
-                unpin_extent_range(root, start, end);
+                unpin_extent_range(root, start, end, true);
                 cond_resched();
         }
 
@@ -8872,6 +8874,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
                                        cache_node);
                 rb_erase(&block_group->cache_node,
                          &info->block_group_cache_tree);
+                RB_CLEAR_NODE(&block_group->cache_node);
                 spin_unlock(&info->block_group_cache_lock);
 
                 down_write(&block_group->space_info->groups_sem);
@@ -9130,6 +9133,7 @@ int btrfs_read_block_groups(struct btrfs_root *root)
                         spin_lock(&info->block_group_cache_lock);
                         rb_erase(&cache->cache_node,
                                  &info->block_group_cache_tree);
+                        RB_CLEAR_NODE(&cache->cache_node);
                         spin_unlock(&info->block_group_cache_lock);
                         btrfs_put_block_group(cache);
                         goto error;
@@ -9271,6 +9275,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                 spin_lock(&root->fs_info->block_group_cache_lock);
                 rb_erase(&cache->cache_node,
                          &root->fs_info->block_group_cache_tree);
+                RB_CLEAR_NODE(&cache->cache_node);
                 spin_unlock(&root->fs_info->block_group_cache_lock);
                 btrfs_put_block_group(cache);
                 return ret;
@@ -9690,13 +9695,7 @@ out:
 
 int btrfs_error_unpin_extent_range(struct btrfs_root *root, u64 start, u64 end)
 {
-        return unpin_extent_range(root, start, end);
-}
-
-int btrfs_error_discard_extent(struct btrfs_root *root, u64 bytenr,
-                               u64 num_bytes, u64 *actual_bytes)
-{
-        return btrfs_discard_extent(root, bytenr, num_bytes, actual_bytes);
+        return unpin_extent_range(root, start, end, false);
 }
 
 int btrfs_trim_fs(struct btrfs_root *root, struct fstrim_range *range)
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 030847bf7cec..d6c03f7f136b 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -2966,8 +2966,8 @@ static int do_trimming(struct btrfs_block_group_cache *block_group,
         spin_unlock(&block_group->lock);
         spin_unlock(&space_info->lock);
 
-        ret = btrfs_error_discard_extent(fs_info->extent_root,
-                                         start, bytes, &trimmed);
+        ret = btrfs_discard_extent(fs_info->extent_root,
+                                   start, bytes, &trimmed);
         if (!ret)
                 *total_trimmed += trimmed;
 
@@ -3185,16 +3185,18 @@ out:
 
                 spin_unlock(&block_group->lock);
 
+                lock_chunks(block_group->fs_info->chunk_root);
                 em_tree = &block_group->fs_info->mapping_tree.map_tree;
                 write_lock(&em_tree->lock);
                 em = lookup_extent_mapping(em_tree, block_group->key.objectid,
                                            1);
                 BUG_ON(!em); /* logic error, can't happen */
+                /*
+                 * remove_extent_mapping() will delete us from the pinned_chunks
+                 * list, which is protected by the chunk mutex.
+                 */
                 remove_extent_mapping(em_tree, em);
                 write_unlock(&em_tree->lock);
-
-                lock_chunks(block_group->fs_info->chunk_root);
-                list_del_init(&em->list);
                 unlock_chunks(block_group->fs_info->chunk_root);
 
                 /* once for us and once for the tree */
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/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index c2d6604667b0..719e1ce1c609 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1917,7 +1917,6 @@ ecryptfs_decode_from_filename(unsigned char *dst, size_t *dst_size,
                         break;
                 case 2:
                         dst[dst_byte_offset++] |= (src_byte);
-                        dst[dst_byte_offset] = 0;
                         current_bit_offset = 0;
                         break;
                 }
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 80154ec4f8c2..6f4e659f508f 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -190,23 +190,11 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
 {
         int rc = 0;
         struct ecryptfs_crypt_stat *crypt_stat = NULL;
-        struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
         struct dentry *ecryptfs_dentry = file->f_path.dentry;
         /* Private value of ecryptfs_dentry allocated in
          * ecryptfs_lookup() */
         struct ecryptfs_file_info *file_info;
 
-        mount_crypt_stat = &ecryptfs_superblock_to_private(
-                ecryptfs_dentry->d_sb)->mount_crypt_stat;
-        if ((mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
-            && ((file->f_flags & O_WRONLY) || (file->f_flags & O_RDWR)
-                || (file->f_flags & O_CREAT) || (file->f_flags & O_TRUNC)
-                || (file->f_flags & O_APPEND))) {
-                printk(KERN_WARNING "Mount has encrypted view enabled; "
-                       "files may only be read\n");
-                rc = -EPERM;
-                goto out;
-        }
         /* Released in ecryptfs_release or end of function if failure */
         file_info = kmem_cache_zalloc(ecryptfs_file_info_cache, GFP_KERNEL);
         ecryptfs_set_file_private(file, file_info);
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 635e8e16a5b7..917bd5c9776a 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -100,12 +100,12 @@ int ecryptfs_parse_packet_length(unsigned char *data, size_t *size,
         (*size) = 0;
         if (data[0] < 192) {
                 /* One-byte length */
-                (*size) = (unsigned char)data[0];
+                (*size) = data[0];
                 (*length_size) = 1;
         } else if (data[0] < 224) {
                 /* Two-byte length */
-                (*size) = (((unsigned char)(data[0]) - 192) * 256);
-                (*size) += ((unsigned char)(data[1]) + 192);
+                (*size) = (data[0] - 192) * 256;
+                (*size) += data[1] + 192;
                 (*length_size) = 2;
         } else if (data[0] == 255) {
                 /* If support is added, adjust ECRYPTFS_MAX_PKT_LEN_SIZE */
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index c4cd1fd86cc2..d9eb84bda559 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -493,6 +493,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
 {
         struct super_block *s;
         struct ecryptfs_sb_info *sbi;
+        struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
         struct ecryptfs_dentry_info *root_info;
         const char *err = "Getting sb failed";
         struct inode *inode;
@@ -511,6 +512,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
                 err = "Error parsing options";
                 goto out;
         }
+        mount_crypt_stat = &sbi->mount_crypt_stat;
 
         s = sget(fs_type, NULL, set_anon_super, flags, NULL);
         if (IS_ERR(s)) {
@@ -557,11 +559,19 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
 
         /**
          * Set the POSIX ACL flag based on whether they're enabled in the lower
-         * mount. Force a read-only eCryptfs mount if the lower mount is ro.
-         * Allow a ro eCryptfs mount even when the lower mount is rw.
+         * mount.
          */
         s->s_flags = flags & ~MS_POSIXACL;
-        s->s_flags |= path.dentry->d_sb->s_flags & (MS_RDONLY | MS_POSIXACL);
+        s->s_flags |= path.dentry->d_sb->s_flags & MS_POSIXACL;
+
+        /**
+         * Force a read-only eCryptfs mount when:
+         *   1) The lower mount is ro
+         *   2) The ecryptfs_encrypted_view mount option is specified
+         */
+        if (path.dentry->d_sb->s_flags & MS_RDONLY ||
+            mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
+                s->s_flags |= MS_RDONLY;
 
         s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
         s->s_blocksize = path.dentry->d_sb->s_blocksize;
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/stat.c b/fs/proc/stat.c
index bf2d03f8fd3e..510413eb25b8 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -159,7 +159,7 @@ static int show_stat(struct seq_file *p, void *v)
 
         /* sum again ? it could be updated? */
         for_each_irq_nr(j)
-                seq_put_decimal_ull(p, ' ', kstat_irqs(j));
+                seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
 
         seq_printf(p,
                 "\nctxt %llu\n"
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;
 }