Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / bad_inode.c

diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 9fc451e..8712062 100644 (file)
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -100,29 +100,12 @@ static int bad_inode_setattr(struct dentry *direntry, struct iattr *attrs)
        return -EIO;
 }
 
-static int bad_inode_setxattr(struct dentry *dentry, struct inode *inode,
-               const char *name, const void *value, size_t size, int flags)
-{
-       return -EIO;
-}
-
-static ssize_t bad_inode_getxattr(struct dentry *dentry, struct inode *inode,
-                       const char *name, void *buffer, size_t size)
-{
-       return -EIO;
-}
-
 static ssize_t bad_inode_listxattr(struct dentry *dentry, char *buffer,
                        size_t buffer_size)
 {
        return -EIO;
 }
 
-static int bad_inode_removexattr(struct dentry *dentry, const char *name)
-{
-       return -EIO;
-}
-
 static const struct inode_operations bad_inode_ops =
 {
        .create         = bad_inode_create,
@@ -142,10 +125,7 @@ static const struct inode_operations bad_inode_ops =
        .permission     = bad_inode_permission,
        .getattr        = bad_inode_getattr,
        .setattr        = bad_inode_setattr,
-       .setxattr       = bad_inode_setxattr,
-       .getxattr       = bad_inode_getxattr,
        .listxattr      = bad_inode_listxattr,
-       .removexattr    = bad_inode_removexattr,
 };
 
 
@@ -175,6 +155,7 @@ void make_bad_inode(struct inode *inode)
        inode->i_atime = inode->i_mtime = inode->i_ctime =
                current_time(inode);
        inode->i_op = &bad_inode_ops;   
+       inode->i_opflags &= ~IOP_XATTR;
        inode->i_fop = &bad_file_ops;   
 }
 EXPORT_SYMBOL(make_bad_inode);