Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6

Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
	fs/nfs/nfs4proc.c

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 1b35d6bd06b0..b1342ffb3cf6 100644
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -173,13 +173,13 @@ static const struct file_operations bad_file_ops =
 };
 
 static int bad_inode_create (struct inode *dir, struct dentry *dentry,
-                umode_t mode, struct nameidata *nd)
+                umode_t mode, bool excl)
 {
         return -EIO;
 }
 
 static struct dentry *bad_inode_lookup(struct inode *dir,
-                        struct dentry *dentry, struct nameidata *nd)
+                        struct dentry *dentry, unsigned int flags)
 {
         return ERR_PTR(-EIO);
 }