Pull bugzilla-5737 into release branch

[linux-2.6] / fs / jfs / super.c

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index bd6720d807a68ed5b66df129292f306f57bd8b54..73d2aba084c62e09d8b1d85f3347ec8e32eae952 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -139,9 +139,9 @@ static void jfs_destroy_inode(struct inode *inode)
        kmem_cache_free(jfs_inode_cachep, ji);
 }
 
-static int jfs_statfs(struct super_block *sb, struct kstatfs *buf)
+static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
-       struct jfs_sb_info *sbi = JFS_SBI(sb);
+       struct jfs_sb_info *sbi = JFS_SBI(dentry->d_sb);
        s64 maxinodes;
        struct inomap *imap = JFS_IP(sbi->ipimap)->i_imap;
 
@@ -194,7 +194,7 @@ static void jfs_put_super(struct super_block *sb)
 enum {
        Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
        Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
-       Opt_usrquota, Opt_grpquota
+       Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask
 };
 
 static match_table_t tokens = {
@@ -208,6 +208,9 @@ static match_table_t tokens = {
        {Opt_ignore, "quota"},
        {Opt_usrquota, "usrquota"},
        {Opt_grpquota, "grpquota"},
+       {Opt_uid, "uid=%u"},
+       {Opt_gid, "gid=%u"},
+       {Opt_umask, "umask=%u"},
        {Opt_err, NULL}
 };
 
@@ -312,7 +315,29 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                               "JFS: quota operations not supported\n");
                        break;
 #endif
-
+               case Opt_uid:
+               {
+                       char *uid = args[0].from;
+                       sbi->uid = simple_strtoul(uid, &uid, 0);
+                       break;
+               }
+               case Opt_gid:
+               {
+                       char *gid = args[0].from;
+                       sbi->gid = simple_strtoul(gid, &gid, 0);
+                       break;
+               }
+               case Opt_umask:
+               {
+                       char *umask = args[0].from;
+                       sbi->umask = simple_strtoul(umask, &umask, 8);
+                       if (sbi->umask & ~0777) {
+                               printk(KERN_ERR
+                                      "JFS: Invalid value of umask\n");
+                               goto cleanup;
+                       }
+                       break;
+               }
                default:
                        printk("jfs: Unrecognized mount option \"%s\" "
                                        " or missing value\n", p);
@@ -395,12 +420,12 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
        if (!new_valid_dev(sb->s_bdev->bd_dev))
                return -EOVERFLOW;
 
-       sbi = kmalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);
+       sbi = kzalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);
        if (!sbi)
                return -ENOSPC;
-       memset(sbi, 0, sizeof (struct jfs_sb_info));
        sb->s_fs_info = sbi;
        sbi->sb = sb;
+       sbi->uid = sbi->gid = sbi->umask = -1;
 
        /* initialize the mount flag and determine the default error handler */
        flag = JFS_ERR_REMOUNT_RO;
@@ -540,10 +565,11 @@ static void jfs_unlockfs(struct super_block *sb)
        }
 }
 
-static struct super_block *jfs_get_sb(struct file_system_type *fs_type, 
-       int flags, const char *dev_name, void *data)
+static int jfs_get_sb(struct file_system_type *fs_type,
+       int flags, const char *dev_name, void *data, struct vfsmount *mnt)
 {
-       return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super);
+       return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super,
+                          mnt);
 }
 
 static int jfs_sync_fs(struct super_block *sb, int wait)
@@ -563,10 +589,14 @@ static int jfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
 {
        struct jfs_sb_info *sbi = JFS_SBI(vfs->mnt_sb);
 
+       if (sbi->uid != -1)
+               seq_printf(seq, ",uid=%d", sbi->uid);
+       if (sbi->gid != -1)
+               seq_printf(seq, ",gid=%d", sbi->gid);
+       if (sbi->umask != -1)
+               seq_printf(seq, ",umask=%03o", sbi->umask);
        if (sbi->flag & JFS_NOINTEGRITY)
                seq_puts(seq, ",nointegrity");
-       else
-               seq_puts(seq, ",integrity");
 
 #if defined(CONFIG_QUOTA)
        if (sbi->flag & JFS_USRQUOTA)
@@ -635,7 +665,8 @@ static int __init init_jfs_fs(void)
 
        jfs_inode_cachep =
            kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0, 
-                           SLAB_RECLAIM_ACCOUNT, init_once, NULL);
+                           SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
+                           init_once, NULL);
        if (jfs_inode_cachep == NULL)
                return -ENOMEM;