Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

5 files changed, 45 insertions, 22 deletions

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index 232c69493683..d5bd497ab9cb 100644
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -174,7 +174,8 @@ extern void			 affs_put_inode(struct inode *inode);
 extern void                      affs_drop_inode(struct inode *inode);
 extern void                      affs_delete_inode(struct inode *inode);
 extern void                      affs_clear_inode(struct inode *inode);
-extern void                      affs_read_inode(struct inode *inode);
+extern struct inode             *affs_iget(struct super_block *sb,
+                                        unsigned long ino);
 extern int                       affs_write_inode(struct inode *inode, int);
 extern int                       affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s32 type);
 
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index f4de4b98004f..805573005de6 100644
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -170,9 +170,11 @@ affs_remove_link(struct dentry *dentry)
                 if (!link_bh)
                         goto done;
 
-                dir = iget(sb, be32_to_cpu(AFFS_TAIL(sb, link_bh)->parent));
-                if (!dir)
+                dir = affs_iget(sb, be32_to_cpu(AFFS_TAIL(sb, link_bh)->parent));
+                if (IS_ERR(dir)) {
+                        retval = PTR_ERR(dir);
                         goto done;
+                }
 
                 affs_lock_dir(dir);
                 affs_fix_dcache(dentry, link_ino);
diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index 4609a6c13fe9..27fe6cbe43ae 100644
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -15,20 +15,25 @@
 extern const struct inode_operations affs_symlink_inode_operations;
 extern struct timezone sys_tz;
 
-void
-affs_read_inode(struct inode *inode)
+struct inode *affs_iget(struct super_block *sb, unsigned long ino)
 {
-        struct super_block      *sb = inode->i_sb;
         struct affs_sb_info     *sbi = AFFS_SB(sb);
         struct buffer_head      *bh;
         struct affs_head        *head;
         struct affs_tail        *tail;
+        struct inode            *inode;
         u32                      block;
         u32                      size;
         u32                      prot;
         u16                      id;
 
-        pr_debug("AFFS: read_inode(%lu)\n",inode->i_ino);
+        inode = iget_locked(sb, ino);
+        if (!inode)
+                return ERR_PTR(-ENOMEM);
+        if (!(inode->i_state & I_NEW))
+                return inode;
+
+        pr_debug("AFFS: affs_iget(%lu)\n", inode->i_ino);
 
         block = inode->i_ino;
         bh = affs_bread(sb, block);
@@ -154,12 +159,13 @@ affs_read_inode(struct inode *inode)
                          sys_tz.tz_minuteswest * 60;
         inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = inode->i_atime.tv_nsec = 0;
         affs_brelse(bh);
-        return;
+        unlock_new_inode(inode);
+        return inode;
 
 bad_inode:
-        make_bad_inode(inode);
         affs_brelse(bh);
-        return;
+        iget_failed(inode);
+        return ERR_PTR(-EIO);
 }
 
 int
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index a42143ca0169..2218f1ee71ce 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -208,9 +208,8 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
         affs_lock_dir(dir);
         bh = affs_find_entry(dir, dentry);
         affs_unlock_dir(dir);
-        if (IS_ERR(bh)) {
-                return ERR_PTR(PTR_ERR(bh));
-        }
+        if (IS_ERR(bh))
+                return ERR_CAST(bh);
         if (bh) {
                 u32 ino = bh->b_blocknr;
 
@@ -223,10 +222,9 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
                         ino = be32_to_cpu(AFFS_TAIL(sb, bh)->original);
                 }
                 affs_brelse(bh);
-                inode = iget(sb, ino);
-                if (!inode) {
-                        return ERR_PTR(-EACCES);
-                }
+                inode = affs_iget(sb, ino);
+                if (IS_ERR(inode))
+                        return ERR_PTR(PTR_ERR(inode));
         }
         dentry->d_op = AFFS_SB(sb)->s_flags & SF_INTL ? &affs_intl_dentry_operations : &affs_dentry_operations;
         d_add(dentry, inode);
diff --git a/fs/affs/super.c b/fs/affs/super.c
index b53e5d0ec65c..d2dc047cb479 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -113,7 +113,6 @@ static void destroy_inodecache(void)
 static const struct super_operations affs_sops = {
         .alloc_inode    = affs_alloc_inode,
         .destroy_inode  = affs_destroy_inode,
-        .read_inode     = affs_read_inode,
         .write_inode    = affs_write_inode,
         .put_inode      = affs_put_inode,
         .drop_inode     = affs_drop_inode,
@@ -123,6 +122,7 @@ static const struct super_operations affs_sops = {
         .write_super    = affs_write_super,
         .statfs         = affs_statfs,
         .remount_fs     = affs_remount,
+        .show_options   = generic_show_options,
 };
 
 enum {
@@ -271,6 +271,9 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
         unsigned long            mount_flags;
         int                      tmp_flags;     /* fix remount prototype... */
         u8                       sig[4];
+        int                      ret = -EINVAL;
+
+        save_mount_options(sb, data);
 
         pr_debug("AFFS: read_super(%s)\n",data ? (const char *)data : "no options");
 
@@ -444,7 +447,12 @@ got_root:
 
         /* set up enough so that it can read an inode */
 
-        root_inode = iget(sb, root_block);
+        root_inode = affs_iget(sb, root_block);
+        if (IS_ERR(root_inode)) {
+                ret = PTR_ERR(root_inode);
+                goto out_error_noinode;
+        }
+
         sb->s_root = d_alloc_root(root_inode);
         if (!sb->s_root) {
                 printk(KERN_ERR "AFFS: Get root inode failed\n");
@@ -461,12 +469,13 @@ got_root:
 out_error:
         if (root_inode)
                 iput(root_inode);
+out_error_noinode:
         kfree(sbi->s_bitmap);
         affs_brelse(root_bh);
         kfree(sbi->s_prefix);
         kfree(sbi);
         sb->s_fs_info = NULL;
-        return -EINVAL;
+        return ret;
 }
 
 static int
@@ -481,14 +490,21 @@ affs_remount(struct super_block *sb, int *flags, char *data)
         int                      root_block;
         unsigned long            mount_flags;
         int                      res = 0;
+        char                    *new_opts = kstrdup(data, GFP_KERNEL);
 
         pr_debug("AFFS: remount(flags=0x%x,opts=\"%s\")\n",*flags,data);
 
         *flags |= MS_NODIRATIME;
 
-        if (!parse_options(data,&uid,&gid,&mode,&reserved,&root_block,
-            &blocksize,&sbi->s_prefix,sbi->s_volume,&mount_flags))
+        if (!parse_options(data, &uid, &gid, &mode, &reserved, &root_block,
+                           &blocksize, &sbi->s_prefix, sbi->s_volume,
+                           &mount_flags)) {
+                kfree(new_opts);
                 return -EINVAL;
+        }
+        kfree(sb->s_options);
+        sb->s_options = new_opts;
+
         sbi->s_flags = mount_flags;
         sbi->s_mode  = mode;
         sbi->s_uid   = uid;