Patched in Tegra support.

5 files changed, 32 insertions, 31 deletions

diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h
index f41e0ef7fdf..d9df5a060a8 100644
--- a/arch/s390/hypfs/hypfs.h
+++ b/arch/s390/hypfs/hypfs.h
@@ -1,7 +1,8 @@
 /*
+ *  arch/s390/hypfs/hypfs.h
  *    Hypervisor filesystem for Linux on s390.
  *
- *    Copyright IBM Corp. 2006
+ *    Copyright (C) IBM Corp. 2006
  *    Author(s): Michael Holzheu <holzheu@de.ibm.com>
  */
 
diff --git a/arch/s390/hypfs/hypfs_dbfs.c b/arch/s390/hypfs/hypfs_dbfs.c
index 13e76dabbe8..b478013b7fe 100644
--- a/arch/s390/hypfs/hypfs_dbfs.c
+++ b/arch/s390/hypfs/hypfs_dbfs.c
@@ -1,7 +1,7 @@
 /*
  * Hypervisor filesystem for Linux on s390 - debugfs interface
  *
- * Copyright IBM Corp. 2010
+ * Copyright (C) IBM Corp. 2010
  * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>
  */
 
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 7fd3690b676..6023c6dc1fb 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -1,4 +1,5 @@
 /*
+ *  arch/s390/hypfs/hypfs_diag.c
  *    Hypervisor filesystem for Linux on s390. Diag 204 and 224
  *    implementation.
  *
@@ -561,9 +562,10 @@ static int dbfs_d204_create(void **data, void **data_free_ptr, size_t *size)
         void *base;
 
         buf_size = PAGE_SIZE * (diag204_buf_pages + 1) + sizeof(d204->hdr);
-        base = vzalloc(buf_size);
+        base = vmalloc(buf_size);
         if (!base)
                 return -ENOMEM;
+        memset(base, 0, buf_size);
         d204 = page_align_ptr(base + sizeof(d204->hdr)) - sizeof(d204->hdr);
         rc = diag204_do_store(d204->buf, diag204_buf_pages);
         if (rc) {
diff --git a/arch/s390/hypfs/hypfs_vm.c b/arch/s390/hypfs/hypfs_vm.c
index 4f6afaa8bd8..e54796002f6 100644
--- a/arch/s390/hypfs/hypfs_vm.c
+++ b/arch/s390/hypfs/hypfs_vm.c
@@ -1,7 +1,7 @@
 /*
  *    Hypervisor filesystem for Linux on s390. z/VM implementation.
  *
- *    Copyright IBM Corp. 2006
+ *    Copyright (C) IBM Corp. 2006
  *    Author(s): Michael Holzheu <holzheu@de.ibm.com>
  */
 
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 06ea69bd387..6fe874fc5f8 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -1,4 +1,5 @@
 /*
+ *  arch/s390/hypfs/inode.c
  *    Hypervisor filesystem for Linux on s390.
  *
  *    Copyright IBM Corp. 2006, 2008
@@ -31,8 +32,8 @@ static struct dentry *hypfs_create_update_file(struct super_block *sb,
                                                struct dentry *dir);
 
 struct hypfs_sb_info {
-        kuid_t uid;                     /* uid used for files and dirs */
-        kgid_t gid;                     /* gid used for files and dirs */
+        uid_t uid;                      /* uid used for files and dirs */
+        gid_t gid;                      /* gid used for files and dirs */
         struct dentry *update_file;     /* file to trigger update */
         time_t last_update;             /* last update time in secs since 1970 */
         struct mutex lock;              /* lock to protect update process */
@@ -72,6 +73,8 @@ static void hypfs_remove(struct dentry *dentry)
         struct dentry *parent;
 
         parent = dentry->d_parent;
+        if (!parent || !parent->d_inode)
+                return;
         mutex_lock(&parent->d_inode->i_mutex);
         if (hypfs_positive(dentry)) {
                 if (S_ISDIR(dentry->d_inode->i_mode))
@@ -94,26 +97,27 @@ static void hypfs_delete_tree(struct dentry *root)
         }
 }
 
-static struct inode *hypfs_make_inode(struct super_block *sb, umode_t mode)
+static struct inode *hypfs_make_inode(struct super_block *sb, int mode)
 {
         struct inode *ret = new_inode(sb);
 
         if (ret) {
                 struct hypfs_sb_info *hypfs_info = sb->s_fs_info;
-                ret->i_ino = get_next_ino();
                 ret->i_mode = mode;
                 ret->i_uid = hypfs_info->uid;
                 ret->i_gid = hypfs_info->gid;
                 ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
-                if (S_ISDIR(mode))
-                        set_nlink(ret, 2);
+                if (mode & S_IFDIR)
+                        ret->i_nlink = 2;
+                else
+                        ret->i_nlink = 1;
         }
         return ret;
 }
 
 static void hypfs_evict_inode(struct inode *inode)
 {
-        clear_inode(inode);
+        end_writeback(inode);
         kfree(inode->i_private);
 }
 
@@ -227,8 +231,6 @@ static int hypfs_parse_options(char *options, struct super_block *sb)
 {
         char *str;
         substring_t args[MAX_OPT_ARGS];
-        kuid_t uid;
-        kgid_t gid;
 
         if (!options)
                 return 0;
@@ -243,18 +245,12 @@ static int hypfs_parse_options(char *options, struct super_block *sb)
                 case opt_uid:
                         if (match_int(&args[0], &option))
                                 return -EINVAL;
-                        uid = make_kuid(current_user_ns(), option);
-                        if (!uid_valid(uid))
-                                return -EINVAL;
-                        hypfs_info->uid = uid;
+                        hypfs_info->uid = option;
                         break;
                 case opt_gid:
                         if (match_int(&args[0], &option))
                                 return -EINVAL;
-                        gid = make_kgid(current_user_ns(), option);
-                        if (!gid_valid(gid))
-                                return -EINVAL;
-                        hypfs_info->gid = gid;
+                        hypfs_info->gid = option;
                         break;
                 case opt_err:
                 default:
@@ -265,12 +261,12 @@ static int hypfs_parse_options(char *options, struct super_block *sb)
         return 0;
 }
 
-static int hypfs_show_options(struct seq_file *s, struct dentry *root)
+static int hypfs_show_options(struct seq_file *s, struct vfsmount *mnt)
 {
-        struct hypfs_sb_info *hypfs_info = root->d_sb->s_fs_info;
+        struct hypfs_sb_info *hypfs_info = mnt->mnt_sb->s_fs_info;
 
-        seq_printf(s, ",uid=%u", from_kuid_munged(&init_user_ns, hypfs_info->uid));
-        seq_printf(s, ",gid=%u", from_kgid_munged(&init_user_ns, hypfs_info->gid));
+        seq_printf(s, ",uid=%u", hypfs_info->uid);
+        seq_printf(s, ",gid=%u", hypfs_info->gid);
         return 0;
 }
 
@@ -299,9 +295,11 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent)
                 return -ENOMEM;
         root_inode->i_op = &simple_dir_inode_operations;
         root_inode->i_fop = &simple_dir_operations;
-        sb->s_root = root_dentry = d_make_root(root_inode);
-        if (!root_dentry)
+        sb->s_root = root_dentry = d_alloc_root(root_inode);
+        if (!root_dentry) {
+                iput(root_inode);
                 return -ENOMEM;
+        }
         if (MACHINE_IS_VM)
                 rc = hypfs_vm_create_files(sb, root_dentry);
         else
@@ -337,7 +335,7 @@ static void hypfs_kill_super(struct super_block *sb)
 
 static struct dentry *hypfs_create_file(struct super_block *sb,
                                         struct dentry *parent, const char *name,
-                                        char *data, umode_t mode)
+                                        char *data, mode_t mode)
 {
         struct dentry *dentry;
         struct inode *inode;
@@ -354,16 +352,16 @@ static struct dentry *hypfs_create_file(struct super_block *sb,
                 dentry = ERR_PTR(-ENOMEM);
                 goto fail;
         }
-        if (S_ISREG(mode)) {
+        if (mode & S_IFREG) {
                 inode->i_fop = &hypfs_file_ops;
                 if (data)
                         inode->i_size = strlen(data);
                 else
                         inode->i_size = 0;
-        } else if (S_ISDIR(mode)) {
+        } else if (mode & S_IFDIR) {
                 inode->i_op = &simple_dir_inode_operations;
                 inode->i_fop = &simple_dir_operations;
-                inc_nlink(parent->d_inode);
+                parent->d_inode->i_nlink++;
         } else
                 BUG();
         inode->i_private = data;