Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-2.6-block.git] / fs / bad_inode.c

diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 72e35b721608e6a1e8468656acf6478a58440b64..3ba385eaa26ee0131e5e3eaf7bfed77290222942 100644 (file)
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -100,8 +100,8 @@ static int bad_inode_setattr(struct dentry *direntry, struct iattr *attrs)
        return -EIO;
 }
 
-static int bad_inode_setxattr(struct dentry *dentry, const char *name,
-               const void *value, size_t size, int flags)
+static int bad_inode_setxattr(struct dentry *dentry, struct inode *inode,
+               const char *name, const void *value, size_t size, int flags)
 {
        return -EIO;
 }