14 files changed, 92 insertions, 49 deletions

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 69ec23daa25e..a1e6860b6f46 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -574,7 +574,7 @@ static int load_flat_file(struct linux_binprm *bprm,
                                 MAX_SHARED_LIBS * sizeof(unsigned long),
                                 FLAT_DATA_ALIGN);
 
-                pr_debug("Allocated data+bss+stack (%ld bytes): %lx\n",
+                pr_debug("Allocated data+bss+stack (%u bytes): %lx\n",
                          data_len + bss_len + stack_len, datapos);
 
                 fpos = ntohl(hdr->data_start);
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index e071d23f6148..ef7240ace576 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -271,6 +271,11 @@ out:
                 if (ret < 0)
                         err = ret;
                 dput(last);
+                /* last_name no longer match cache index */
+                if (fi->readdir_cache_idx >= 0) {
+                        fi->readdir_cache_idx = -1;
+                        fi->dir_release_count = 0;
+                }
         }
         return err;
 }
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index 79dafa71effd..51f0aea70cb4 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -175,11 +175,8 @@ ext2_get_acl(struct inode *inode, int type)
         return acl;
 }
 
-/*
- * inode->i_mutex: down
- */
-int
-ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
+static int
+__ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 {
         int name_index;
         void *value = NULL;
@@ -189,13 +186,6 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
         switch(type) {
                 case ACL_TYPE_ACCESS:
                         name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;
-                        if (acl) {
-                                error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
-                                if (error)
-                                        return error;
-                                inode->i_ctime = current_time(inode);
-                                mark_inode_dirty(inode);
-                        }
                         break;
 
                 case ACL_TYPE_DEFAULT:
@@ -222,6 +212,31 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 }
 
 /*
+ * inode->i_mutex: down
+ */
+int
+ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
+{
+        int error;
+        int update_mode = 0;
+        umode_t mode = inode->i_mode;
+
+        if (type == ACL_TYPE_ACCESS && acl) {
+                error = posix_acl_update_mode(inode, &mode, &acl);
+                if (error)
+                        return error;
+                update_mode = 1;
+        }
+        error = __ext2_set_acl(inode, acl, type);
+        if (!error && update_mode) {
+                inode->i_mode = mode;
+                inode->i_ctime = current_time(inode);
+                mark_inode_dirty(inode);
+        }
+        return error;
+}
+
+/*
  * Initialize the ACLs of a new inode. Called from ext2_new_inode.
  *
  * dir->i_mutex: down
@@ -238,12 +253,12 @@ ext2_init_acl(struct inode *inode, struct inode *dir)
                 return error;
 
         if (default_acl) {
-                error = ext2_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
+                error = __ext2_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
                 posix_acl_release(default_acl);
         }
         if (acl) {
                 if (!error)
-                        error = ext2_set_acl(inode, acl, ACL_TYPE_ACCESS);
+                        error = __ext2_set_acl(inode, acl, ACL_TYPE_ACCESS);
                 posix_acl_release(acl);
         }
         return error;
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index a140c5e3dc54..b4b8438c42ef 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -211,7 +211,7 @@ static int __f2fs_set_acl(struct inode *inode, int type,
         switch (type) {
         case ACL_TYPE_ACCESS:
                 name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS;
-                if (acl) {
+                if (acl && !ipage) {
                         error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
                         if (error)
                                 return error;
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 56bbf592e487..5b876f6d3f6b 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -879,6 +879,7 @@ int sync_dirty_inodes(struct f2fs_sb_info *sbi, enum inode_type type)
         struct inode *inode;
         struct f2fs_inode_info *fi;
         bool is_dir = (type == DIR_INODE);
+        unsigned long ino = 0;
 
         trace_f2fs_sync_dirty_inodes_enter(sbi->sb, is_dir,
                                 get_pages(sbi, is_dir ?
@@ -901,8 +902,17 @@ retry:
         inode = igrab(&fi->vfs_inode);
         spin_unlock(&sbi->inode_lock[type]);
         if (inode) {
+                unsigned long cur_ino = inode->i_ino;
+
                 filemap_fdatawrite(inode->i_mapping);
                 iput(inode);
+                /* We need to give cpu to another writers. */
+                if (ino == cur_ino) {
+                        congestion_wait(BLK_RW_ASYNC, HZ/50);
+                        cond_resched();
+                } else {
+                        ino = cur_ino;
+                }
         } else {
                 /*
                  * We should submit bio, since it exists several
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index a0e6d2c65a9e..2706130c261b 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1538,7 +1538,6 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 
         /* Is it quota file? Do not allow user to mess with it */
         if (IS_NOQUOTA(inode)) {
-                inode_unlock(inode);
                 ret = -EPERM;
                 goto unlock_out;
         }
@@ -1549,9 +1548,8 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 
         if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
                 if (!capable(CAP_LINUX_IMMUTABLE)) {
-                        inode_unlock(inode);
                         ret = -EPERM;
-                        goto out;
+                        goto unlock_out;
                 }
         }
 
@@ -1564,7 +1562,6 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
         f2fs_mark_inode_dirty_sync(inode, false);
 unlock_out:
         inode_unlock(inode);
-out:
         mnt_drop_write_file(filp);
         return ret;
 }
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 9adc202fcd6f..71191d89917d 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -11,6 +11,7 @@
  */
 #include <linux/proc_fs.h>
 #include <linux/f2fs_fs.h>
+#include <linux/seq_file.h>
 
 #include "f2fs.h"
 #include "segment.h"
diff --git a/fs/hfsplus/posix_acl.c b/fs/hfsplus/posix_acl.c
index 9b92058a1240..6bb5d7c42888 100644
--- a/fs/hfsplus/posix_acl.c
+++ b/fs/hfsplus/posix_acl.c
@@ -51,8 +51,8 @@ struct posix_acl *hfsplus_get_posix_acl(struct inode *inode, int type)
         return acl;
 }
 
-int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
-                int type)
+static int __hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
+                                   int type)
 {
         int err;
         char *xattr_name;
@@ -64,12 +64,6 @@ int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
         switch (type) {
         case ACL_TYPE_ACCESS:
                 xattr_name = XATTR_NAME_POSIX_ACL_ACCESS;
-                if (acl) {
-                        err = posix_acl_update_mode(inode, &inode->i_mode, &acl);
-                        if (err)
-                                return err;
-                }
-                err = 0;
                 break;
 
         case ACL_TYPE_DEFAULT:
@@ -105,6 +99,18 @@ end_set_acl:
         return err;
 }
 
+int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl, int type)
+{
+        int err;
+
+        if (type == ACL_TYPE_ACCESS && acl) {
+                err = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+                if (err)
+                        return err;
+        }
+        return __hfsplus_set_posix_acl(inode, acl, type);
+}
+
 int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir)
 {
         int err = 0;
@@ -122,15 +128,15 @@ int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir)
                 return err;
 
         if (default_acl) {
-                err = hfsplus_set_posix_acl(inode, default_acl,
-                                            ACL_TYPE_DEFAULT);
+                err = __hfsplus_set_posix_acl(inode, default_acl,
+                                              ACL_TYPE_DEFAULT);
                 posix_acl_release(default_acl);
         }
 
         if (acl) {
                 if (!err)
-                        err = hfsplus_set_posix_acl(inode, acl,
-                                                    ACL_TYPE_ACCESS);
+                        err = __hfsplus_set_posix_acl(inode, acl,
+                                                      ACL_TYPE_ACCESS);
                 posix_acl_release(acl);
         }
         return err;
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 8cf898a59730..217a5e7815da 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -410,7 +410,11 @@ static int parse_options(char *options, struct iso9660_options *popt)
                         if (match_int(&args[0], &option))
                                 return 0;
                         n = option;
-                        if (n > 99)
+                        /*
+                         * Track numbers are supposed to be in range 1-99, the
+                         * mount option starts indexing at 0.
+                         */
+                        if (n >= 99)
                                 return 0;
                         popt->session = n + 1;
                         break;
@@ -543,7 +547,7 @@ static unsigned int isofs_get_last_session(struct super_block *sb, s32 session)
 
         vol_desc_start=0;
         ms_info.addr_format=CDROM_LBA;
-        if(session >= 0 && session <= 99) {
+        if (session > 0) {
                 struct cdrom_tocentry Te;
                 Te.cdte_track=session;
                 Te.cdte_format=CDROM_LBA;
diff --git a/fs/mount.h b/fs/mount.h
index de45d9e76748..6790767d1883 100644
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -16,7 +16,7 @@ struct mnt_namespace {
         u64 event;
         unsigned int            mounts; /* # of mounts in the namespace */
         unsigned int            pending_mounts;
-};
+} __randomize_layout;
 
 struct mnt_pcp {
         int mnt_count;
@@ -69,7 +69,7 @@ struct mount {
         struct hlist_head mnt_pins;
         struct fs_pin mnt_umount;
         struct dentry *mnt_ex_mountpoint;
-};
+} __randomize_layout;
 
 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
 
diff --git a/fs/namei.c b/fs/namei.c
index 88fd38d1e3e7..ddb6a7c2b3d4 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -524,7 +524,7 @@ struct nameidata {
         struct inode    *link_inode;
         unsigned        root_seq;
         int             dfd;
-};
+} __randomize_layout;
 
 static void set_nameidata(struct nameidata *p, int dfd, struct filename *name)
 {
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index b45083c0f9ae..49b0a9e7ff18 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -720,8 +720,8 @@ static const struct rpc_version nfs_cb_version4 = {
         .counts                 = nfs4_cb_counts,
 };
 
-static const struct rpc_version *nfs_cb_version[] = {
-        &nfs_cb_version4,
+static const struct rpc_version *nfs_cb_version[2] = {
+        [1] = &nfs_cb_version4,
 };
 
 static const struct rpc_program cb_program;
@@ -795,7 +795,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c
                 .saddress       = (struct sockaddr *) &conn->cb_saddr,
                 .timeout        = &timeparms,
                 .program        = &cb_program,
-                .version        = 0,
+                .version        = 1,
                 .flags          = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),
         };
         struct rpc_clnt *client;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 18694598bebf..aa2b89071630 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -51,7 +51,7 @@ struct proc_dir_entry {
         spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
         u8 namelen;
         char name[];
-};
+} __randomize_layout;
 
 union proc_op {
         int (*proc_get_link)(struct dentry *, struct path *);
@@ -70,7 +70,7 @@ struct proc_inode {
         struct hlist_node sysctl_inodes;
         const struct proc_ns_operations *ns_ops;
         struct inode vfs_inode;
-};
+} __randomize_layout;
 
 /*
  * General functions
@@ -279,7 +279,7 @@ struct proc_maps_private {
 #ifdef CONFIG_NUMA
         struct mempolicy *task_mempolicy;
 #endif
-};
+} __randomize_layout;
 
 struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode);
 
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
index 3d2256a425ee..54415f0e3d18 100644
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
@@ -23,7 +23,8 @@ reiserfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
         struct reiserfs_transaction_handle th;
         size_t jcreate_blocks;
         int size = acl ? posix_acl_xattr_size(acl->a_count) : 0;
-
+        int update_mode = 0;
+        umode_t mode = inode->i_mode;
 
         /*
          * Pessimism: We can't assume that anything from the xattr root up
@@ -37,7 +38,16 @@ reiserfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
         error = journal_begin(&th, inode->i_sb, jcreate_blocks);
         reiserfs_write_unlock(inode->i_sb);
         if (error == 0) {
+                if (type == ACL_TYPE_ACCESS && acl) {
+                        error = posix_acl_update_mode(inode, &mode, &acl);
+                        if (error)
+                                goto unlock;
+                        update_mode = 1;
+                }
                 error = __reiserfs_set_acl(&th, inode, type, acl);
+                if (!error && update_mode)
+                        inode->i_mode = mode;
+unlock:
                 reiserfs_write_lock(inode->i_sb);
                 error2 = journal_end(&th);
                 reiserfs_write_unlock(inode->i_sb);
@@ -241,11 +251,6 @@ __reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
         switch (type) {
         case ACL_TYPE_ACCESS:
                 name = XATTR_NAME_POSIX_ACL_ACCESS;
-                if (acl) {
-                        error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
-                        if (error)
-                                return error;
-                }
                 break;
         case ACL_TYPE_DEFAULT:
                 name = XATTR_NAME_POSIX_ACL_DEFAULT;