diff options
author | Christoph Hellwig <hch@lst.de> | 2006-01-09 23:51:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:30 -0500 |
commit | b98932cb514eef404c6168c9a15cf28851498dea (patch) | |
tree | 445c3d1b2510dec9ba5caf38e9e44e1d96a712cb /fs/reiserfs/xattr.c | |
parent | c37ef806a3e1c0bca65fd03b7590d56d19625da4 (diff) |
[PATCH] remove reiserfs xattr permission checks
remove checks now in the VFS
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/reiserfs/xattr.c')
-rw-r--r-- | fs/reiserfs/xattr.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index f1895f0a278e..6f99e01f94ab 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
@@ -497,12 +497,6 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, | |||
497 | struct iattr newattrs; | 497 | struct iattr newattrs; |
498 | __u32 xahash = 0; | 498 | __u32 xahash = 0; |
499 | 499 | ||
500 | if (IS_RDONLY(inode)) | ||
501 | return -EROFS; | ||
502 | |||
503 | if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) | ||
504 | return -EPERM; | ||
505 | |||
506 | if (get_inode_sd_version(inode) == STAT_DATA_V1) | 500 | if (get_inode_sd_version(inode) == STAT_DATA_V1) |
507 | return -EOPNOTSUPP; | 501 | return -EOPNOTSUPP; |
508 | 502 | ||
@@ -758,9 +752,6 @@ int reiserfs_xattr_del(struct inode *inode, const char *name) | |||
758 | struct dentry *dir; | 752 | struct dentry *dir; |
759 | int err; | 753 | int err; |
760 | 754 | ||
761 | if (IS_RDONLY(inode)) | ||
762 | return -EROFS; | ||
763 | |||
764 | dir = open_xa_dir(inode, FL_READONLY); | 755 | dir = open_xa_dir(inode, FL_READONLY); |
765 | if (IS_ERR(dir)) { | 756 | if (IS_ERR(dir)) { |
766 | err = PTR_ERR(dir); | 757 | err = PTR_ERR(dir); |
@@ -984,12 +975,6 @@ reiserfs_setxattr(struct dentry *dentry, const char *name, const void *value, | |||
984 | get_inode_sd_version(dentry->d_inode) == STAT_DATA_V1) | 975 | get_inode_sd_version(dentry->d_inode) == STAT_DATA_V1) |
985 | return -EOPNOTSUPP; | 976 | return -EOPNOTSUPP; |
986 | 977 | ||
987 | if (IS_RDONLY(dentry->d_inode)) | ||
988 | return -EROFS; | ||
989 | |||
990 | if (IS_IMMUTABLE(dentry->d_inode) || IS_APPEND(dentry->d_inode)) | ||
991 | return -EROFS; | ||
992 | |||
993 | reiserfs_write_lock_xattr_i(dentry->d_inode); | 978 | reiserfs_write_lock_xattr_i(dentry->d_inode); |
994 | lock = !has_xattr_dir(dentry->d_inode); | 979 | lock = !has_xattr_dir(dentry->d_inode); |
995 | if (lock) | 980 | if (lock) |
@@ -1019,12 +1004,6 @@ int reiserfs_removexattr(struct dentry *dentry, const char *name) | |||
1019 | get_inode_sd_version(dentry->d_inode) == STAT_DATA_V1) | 1004 | get_inode_sd_version(dentry->d_inode) == STAT_DATA_V1) |
1020 | return -EOPNOTSUPP; | 1005 | return -EOPNOTSUPP; |
1021 | 1006 | ||
1022 | if (IS_RDONLY(dentry->d_inode)) | ||
1023 | return -EROFS; | ||
1024 | |||
1025 | if (IS_IMMUTABLE(dentry->d_inode) || IS_APPEND(dentry->d_inode)) | ||
1026 | return -EPERM; | ||
1027 | |||
1028 | reiserfs_write_lock_xattr_i(dentry->d_inode); | 1007 | reiserfs_write_lock_xattr_i(dentry->d_inode); |
1029 | reiserfs_read_lock_xattrs(dentry->d_sb); | 1008 | reiserfs_read_lock_xattrs(dentry->d_sb); |
1030 | 1009 | ||