Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

4 files changed, 12 insertions, 11 deletions

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index a46101ee867a..65b3a1b5b88d 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -435,7 +435,7 @@ static int jffs2_acl_setxattr(struct inode *inode, int type, const void *value,
         struct posix_acl *acl;
         int rc;
 
-        if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+        if (!is_owner_or_cap(inode))
                 return -EPERM;
 
         if (value) {
diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 8754b2742112..d568ae846741 100644
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -81,6 +81,7 @@ static int jffs2_garbage_collect_thread(void *_c)
 
         set_user_nice(current, 10);
 
+        set_freezable();
         for (;;) {
                 allow_signal(SIGHUP);
         again:
diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c
index 35c1a5e30ba1..f9211252b5f1 100644
--- a/fs/jffs2/malloc.c
+++ b/fs/jffs2/malloc.c
@@ -33,56 +33,56 @@ int __init jffs2_create_slab_caches(void)
 {
         full_dnode_slab = kmem_cache_create("jffs2_full_dnode",
                                             sizeof(struct jffs2_full_dnode),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!full_dnode_slab)
                 goto err;
 
         raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",
                                             sizeof(struct jffs2_raw_dirent),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!raw_dirent_slab)
                 goto err;
 
         raw_inode_slab = kmem_cache_create("jffs2_raw_inode",
                                            sizeof(struct jffs2_raw_inode),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (!raw_inode_slab)
                 goto err;
 
         tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode",
                                                 sizeof(struct jffs2_tmp_dnode_info),
-                                                0, 0, NULL, NULL);
+                                                0, 0, NULL);
         if (!tmp_dnode_info_slab)
                 goto err;
 
         raw_node_ref_slab = kmem_cache_create("jffs2_refblock",
                                               sizeof(struct jffs2_raw_node_ref) * (REFS_PER_BLOCK + 1),
-                                              0, 0, NULL, NULL);
+                                              0, 0, NULL);
         if (!raw_node_ref_slab)
                 goto err;
 
         node_frag_slab = kmem_cache_create("jffs2_node_frag",
                                            sizeof(struct jffs2_node_frag),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (!node_frag_slab)
                 goto err;
 
         inode_cache_slab = kmem_cache_create("jffs2_inode_cache",
                                              sizeof(struct jffs2_inode_cache),
-                                             0, 0, NULL, NULL);
+                                             0, 0, NULL);
         if (!inode_cache_slab)
                 goto err;
 
 #ifdef CONFIG_JFFS2_FS_XATTR
         xattr_datum_cache = kmem_cache_create("jffs2_xattr_datum",
                                              sizeof(struct jffs2_xattr_datum),
-                                             0, 0, NULL, NULL);
+                                             0, 0, NULL);
         if (!xattr_datum_cache)
                 goto err;
 
         xattr_ref_cache = kmem_cache_create("jffs2_xattr_ref",
                                            sizeof(struct jffs2_xattr_ref),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (!xattr_ref_cache)
                 goto err;
 #endif
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index e220d3bd610d..be2b70c2ec16 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -192,7 +192,7 @@ static int __init init_jffs2_fs(void)
                                              sizeof(struct jffs2_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             jffs2_i_init_once, NULL);
+                                             jffs2_i_init_once);
         if (!jffs2_inode_cachep) {
                 printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
                 return -ENOMEM;