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

5 files changed, 21 insertions, 20 deletions

diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 0cc3597c1197..b58af8f18bc4 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -512,7 +512,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
         key = afs_request_key(vnode->volume->cell);
         if (IS_ERR(key)) {
                 _leave(" = %ld [key]", PTR_ERR(key));
-                return ERR_PTR(PTR_ERR(key));
+                return ERR_CAST(key);
         }
 
         ret = afs_validate(vnode, key);
@@ -540,7 +540,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
         key_put(key);
         if (IS_ERR(inode)) {
                 _leave(" = %ld", PTR_ERR(inode));
-                return ERR_PTR(PTR_ERR(inode));
+                return ERR_CAST(inode);
         }
 
         dentry->d_op = &afs_fs_dentry_operations;
diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 84750c8e9f95..08db82e1343a 100644
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -196,10 +196,7 @@ struct inode *afs_iget(struct super_block *sb, struct key *key,
 
         /* failure */
 bad_inode:
-        make_bad_inode(inode);
-        unlock_new_inode(inode);
-        iput(inode);
-
+        iget_failed(inode);
         _leave(" = %d [bad]", ret);
         return ERR_PTR(ret);
 }
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 5ce43b63c60e..a3510b8ba3e7 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -218,16 +218,16 @@ static void *afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
         _enter("%p{%s},{%s:%p{%s},}",
                dentry,
                dentry->d_name.name,
-               nd->mnt->mnt_devname,
+               nd->path.mnt->mnt_devname,
                dentry,
-               nd->dentry->d_name.name);
+               nd->path.dentry->d_name.name);
 
-        dput(nd->dentry);
-        nd->dentry = dget(dentry);
+        dput(nd->path.dentry);
+        nd->path.dentry = dget(dentry);
 
-        newmnt = afs_mntpt_do_automount(nd->dentry);
+        newmnt = afs_mntpt_do_automount(nd->path.dentry);
         if (IS_ERR(newmnt)) {
-                path_release(nd);
+                path_put(&nd->path);
                 return (void *)newmnt;
         }
 
@@ -235,17 +235,16 @@ static void *afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
         err = do_add_mount(newmnt, nd, MNT_SHRINKABLE, &afs_vfsmounts);
         switch (err) {
         case 0:
-                dput(nd->dentry);
-                mntput(nd->mnt);
-                nd->mnt = newmnt;
-                nd->dentry = dget(newmnt->mnt_root);
+                path_put(&nd->path);
+                nd->path.mnt = newmnt;
+                nd->path.dentry = dget(newmnt->mnt_root);
                 schedule_delayed_work(&afs_mntpt_expiry_timer,
                                       afs_mntpt_expiry_timeout * HZ);
                 break;
         case -EBUSY:
                 /* someone else made a mount here whilst we were busy */
-                while (d_mountpoint(nd->dentry) &&
-                       follow_down(&nd->mnt, &nd->dentry))
+                while (d_mountpoint(nd->path.dentry) &&
+                       follow_down(&nd->path.mnt, &nd->path.dentry))
                         ;
                 err = 0;
         default:
diff --git a/fs/afs/security.c b/fs/afs/security.c
index 566fe712c682..3bcbeceba1bb 100644
--- a/fs/afs/security.c
+++ b/fs/afs/security.c
@@ -95,7 +95,7 @@ static struct afs_vnode *afs_get_auth_inode(struct afs_vnode *vnode,
                 auth_inode = afs_iget(vnode->vfs_inode.i_sb, key,
                                       &vnode->status.parent, NULL, NULL);
                 if (IS_ERR(auth_inode))
-                        return ERR_PTR(PTR_ERR(auth_inode));
+                        return ERR_CAST(auth_inode);
         }
 
         auth_vnode = AFS_FS_I(auth_inode);
@@ -287,7 +287,7 @@ static int afs_check_permit(struct afs_vnode *vnode, struct key *key,
 int afs_permission(struct inode *inode, int mask, struct nameidata *nd)
 {
         struct afs_vnode *vnode = AFS_FS_I(inode);
-        afs_access_t access;
+        afs_access_t uninitialized_var(access);
         struct key *key;
         int ret;
 
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 4b2558c42213..36bbce45f44b 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -52,6 +52,7 @@ static const struct super_operations afs_super_ops = {
         .clear_inode    = afs_clear_inode,
         .umount_begin   = afs_umount_begin,
         .put_super      = afs_put_super,
+        .show_options   = generic_show_options,
 };
 
 static struct kmem_cache *afs_inode_cachep;
@@ -357,6 +358,7 @@ static int afs_get_sb(struct file_system_type *fs_type,
         struct super_block *sb;
         struct afs_volume *vol;
         struct key *key;
+        char *new_opts = kstrdup(options, GFP_KERNEL);
         int ret;
 
         _enter(",,%s,%p", dev_name, options);
@@ -408,9 +410,11 @@ static int afs_get_sb(struct file_system_type *fs_type,
                         deactivate_super(sb);
                         goto error;
                 }
+                sb->s_options = new_opts;
                 sb->s_flags |= MS_ACTIVE;
         } else {
                 _debug("reuse");
+                kfree(new_opts);
                 ASSERTCMP(sb->s_flags, &, MS_ACTIVE);
         }
 
@@ -424,6 +428,7 @@ error:
         afs_put_volume(params.volume);
         afs_put_cell(params.cell);
         key_put(params.key);
+        kfree(new_opts);
         _leave(" = %d", ret);
         return ret;
 }