Patched in Tegra support.

1 files changed, 29 insertions, 93 deletions

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 1a543be09c7..06c8a67cbe7 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -33,7 +33,6 @@
 #include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <linux/seq_file.h>
-#include <linux/blkdev.h>
 
 #include "jfs_incore.h"
 #include "jfs_filsys.h"
@@ -101,7 +100,7 @@ void jfs_error(struct super_block *sb, const char * function, ...)
         vsnprintf(error_buf, sizeof(error_buf), function, args);
         va_end(args);
 
-        pr_err("ERROR: (device %s): %s\n", sb->s_id, error_buf);
+        printk(KERN_ERR "ERROR: (device %s): %s\n", sb->s_id, error_buf);
 
         jfs_handle_error(sb);
 }
@@ -120,6 +119,7 @@ static void jfs_i_callback(struct rcu_head *head)
 {
         struct inode *inode = container_of(head, struct inode, i_rcu);
         struct jfs_inode_info *ji = JFS_IP(inode);
+        INIT_LIST_HEAD(&inode->i_dentry);
         kmem_cache_free(jfs_inode_cachep, ji);
 }
 
@@ -198,8 +198,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_uid, Opt_gid, Opt_umask,
-        Opt_discard, Opt_nodiscard, Opt_discard_minblk
+        Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask
 };
 
 static const match_table_t tokens = {
@@ -216,9 +215,6 @@ static const match_table_t tokens = {
         {Opt_uid, "uid=%u"},
         {Opt_gid, "gid=%u"},
         {Opt_umask, "umask=%u"},
-        {Opt_discard, "discard"},
-        {Opt_nodiscard, "nodiscard"},
-        {Opt_discard_minblk, "discard=%u"},
         {Opt_err, NULL}
 };
 
@@ -260,7 +256,8 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                         else {
                                 nls_map = load_nls(args[0].from);
                                 if (!nls_map) {
-                                        pr_err("JFS: charset not found\n");
+                                        printk(KERN_ERR
+                                               "JFS: charset not found\n");
                                         goto cleanup;
                                 }
                         }
@@ -276,7 +273,8 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                         *newLVSize = sb->s_bdev->bd_inode->i_size >>
                                 sb->s_blocksize_bits;
                         if (*newLVSize == 0)
-                                pr_err("JFS: Cannot determine volume size\n");
+                                printk(KERN_ERR
+                                       "JFS: Cannot determine volume size\n");
                         break;
                 }
                 case Opt_errors:
@@ -297,7 +295,8 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                                 *flag &= ~JFS_ERR_REMOUNT_RO;
                                 *flag |= JFS_ERR_PANIC;
                         } else {
-                                pr_err("JFS: %s is an invalid error handler\n",
+                                printk(KERN_ERR
+                                       "JFS: %s is an invalid error handler\n",
                                        errors);
                                 goto cleanup;
                         }
@@ -316,76 +315,33 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                 case Opt_usrquota:
                 case Opt_grpquota:
                 case Opt_quota:
-                        pr_err("JFS: quota operations not supported\n");
+                        printk(KERN_ERR
+                               "JFS: quota operations not supported\n");
                         break;
 #endif
                 case Opt_uid:
                 {
                         char *uid = args[0].from;
-                        uid_t val = simple_strtoul(uid, &uid, 0);
-                        sbi->uid = make_kuid(current_user_ns(), val);
-                        if (!uid_valid(sbi->uid))
-                                goto cleanup;
+                        sbi->uid = simple_strtoul(uid, &uid, 0);
                         break;
                 }
-
                 case Opt_gid:
                 {
                         char *gid = args[0].from;
-                        gid_t val = simple_strtoul(gid, &gid, 0);
-                        sbi->gid = make_kgid(current_user_ns(), val);
-                        if (!gid_valid(sbi->gid))
-                                goto cleanup;
+                        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) {
-                                pr_err("JFS: Invalid value of umask\n");
+                                printk(KERN_ERR
+                                       "JFS: Invalid value of umask\n");
                                 goto cleanup;
                         }
                         break;
                 }
-
-                case Opt_discard:
-                {
-                        struct request_queue *q = bdev_get_queue(sb->s_bdev);
-                        /* if set to 1, even copying files will cause
-                         * trimming :O
-                         * -> user has more control over the online trimming
-                         */
-                        sbi->minblks_trim = 64;
-                        if (blk_queue_discard(q)) {
-                                *flag |= JFS_DISCARD;
-                        } else {
-                                pr_err("JFS: discard option " \
-                                        "not supported on device\n");
-                        }
-                        break;
-                }
-
-                case Opt_nodiscard:
-                        *flag &= ~JFS_DISCARD;
-                        break;
-
-                case Opt_discard_minblk:
-                {
-                        struct request_queue *q = bdev_get_queue(sb->s_bdev);
-                        char *minblks_trim = args[0].from;
-                        if (blk_queue_discard(q)) {
-                                *flag |= JFS_DISCARD;
-                                sbi->minblks_trim = simple_strtoull(
-                                        minblks_trim, &minblks_trim, 0);
-                        } else {
-                                pr_err("JFS: discard option " \
-                                        "not supported on device\n");
-                        }
-                        break;
-                }
-
                 default:
                         printk("jfs: Unrecognized mount option \"%s\" "
                                         " or missing value\n", p);
@@ -419,8 +375,8 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)
 
         if (newLVSize) {
                 if (sb->s_flags & MS_RDONLY) {
-                        pr_err("JFS: resize requires volume" \
-                                " to be mounted read-write\n");
+                        printk(KERN_ERR
+                  "JFS: resize requires volume to be mounted read-write\n");
                         return -EROFS;
                 }
                 rc = jfs_extendfs(sb, newLVSize, 0);
@@ -486,11 +442,8 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
                 return -ENOMEM;
 
         sb->s_fs_info = sbi;
-        sb->s_max_links = JFS_LINK_MAX;
         sbi->sb = sb;
-        sbi->uid = INVALID_UID;
-        sbi->gid = INVALID_GID;
-        sbi->umask = -1;
+        sbi->uid = sbi->gid = sbi->umask = -1;
 
         /* initialize the mount flag and determine the default error handler */
         flag = JFS_ERR_REMOUNT_RO;
@@ -504,7 +457,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
 #endif
 
         if (newLVSize) {
-                pr_err("resize option for remount only\n");
+                printk(KERN_ERR "resize option for remount only\n");
                 goto out_kfree;
         }
 
@@ -532,6 +485,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
                 goto out_unload;
         }
         inode->i_ino = 0;
+        inode->i_nlink = 1;
         inode->i_size = sb->s_bdev->bd_inode->i_size;
         inode->i_mapping->a_ops = &jfs_metapage_aops;
         insert_inode_hash(inode);
@@ -569,7 +523,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
                 ret = PTR_ERR(inode);
                 goto out_no_rw;
         }
-        sb->s_root = d_make_root(inode);
+        sb->s_root = d_alloc_root(inode);
         if (!sb->s_root)
                 goto out_no_root;
 
@@ -587,6 +541,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
 
 out_no_root:
         jfs_err("jfs_read_super: get root dentry failed");
+        iput(inode);
 
 out_no_rw:
         rc = jfs_umount(sb);
@@ -648,11 +603,6 @@ static int jfs_sync_fs(struct super_block *sb, int wait)
 
         /* log == NULL indicates read-only mount */
         if (log) {
-                /*
-                 * Write quota structures to quota file, sync_blockdev() will
-                 * write them to disk later
-                 */
-                dquot_writeback_dquots(sb, -1);
                 jfs_flush_journal(log, wait);
                 jfs_syncpt(log, 0);
         }
@@ -660,20 +610,18 @@ static int jfs_sync_fs(struct super_block *sb, int wait)
         return 0;
 }
 
-static int jfs_show_options(struct seq_file *seq, struct dentry *root)
+static int jfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
 {
-        struct jfs_sb_info *sbi = JFS_SBI(root->d_sb);
+        struct jfs_sb_info *sbi = JFS_SBI(vfs->mnt_sb);
 
-        if (uid_valid(sbi->uid))
-                seq_printf(seq, ",uid=%d", from_kuid(&init_user_ns, sbi->uid));
-        if (gid_valid(sbi->gid))
-                seq_printf(seq, ",gid=%d", from_kgid(&init_user_ns, sbi->gid));
+        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");
-        if (sbi->flag & JFS_DISCARD)
-                seq_printf(seq, ",discard=%u", sbi->minblks_trim);
         if (sbi->nls_tab)
                 seq_printf(seq, ",iocharset=%s", sbi->nls_tab->charset);
         if (sbi->flag & JFS_ERR_CONTINUE)
@@ -914,14 +862,8 @@ static int __init init_jfs_fs(void)
         jfs_proc_init();
 #endif
 
-        rc = register_filesystem(&jfs_fs_type);
-        if (!rc)
-                return 0;
+        return register_filesystem(&jfs_fs_type);
 
-#ifdef PROC_FS_JFS
-        jfs_proc_clean();
-#endif
-        kthread_stop(jfsSyncThread);
 kill_committask:
         for (i = 0; i < commit_threads; i++)
                 kthread_stop(jfsCommitThread[i]);
@@ -952,12 +894,6 @@ static void __exit exit_jfs_fs(void)
         jfs_proc_clean();
 #endif
         unregister_filesystem(&jfs_fs_type);
-
-        /*
-         * Make sure all delayed rcu free inodes are flushed before we
-         * destroy cache.
-         */
-        rcu_barrier();
         kmem_cache_destroy(jfs_inode_cachep);
 }