summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2006-11-02 10:50:40 -0600
committerDave Kleikamp <shaggy@austin.ibm.com>2006-11-02 10:50:40 -0600
commitd572b87946f8c598b3cad86a7913862dd48daadb (patch)
tree45c2fbfc33ee6f04cb78fa9b1f5e0d6d9b8fafc9 /fs
parent89f68225876db7df638de2884b561facb1870239 (diff)
downloadlinux-3.10-d572b87946f8c598b3cad86a7913862dd48daadb.tar.gz
linux-3.10-d572b87946f8c598b3cad86a7913862dd48daadb.tar.bz2
linux-3.10-d572b87946f8c598b3cad86a7913862dd48daadb.zip
JFS: Remove redundant xattr permission checking
The vfs handles most permissions for setting and retrieving xattrs. This patch removes a redundant and wrong check so that it won't override the correct behavior which is being fixed in the vfs. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/xattr.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 4c7985ebca9..b753ba21645 100644
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -756,6 +756,11 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
return -EOPNOTSUPP;
}
+/*
+ * Most of the permission checking is done by xattr_permission in the vfs.
+ * The local file system is responsible for handling the system.* namespace.
+ * We also need to verify that this is a namespace that we recognize.
+ */
static int can_set_xattr(struct inode *inode, const char *name,
const void *value, size_t value_len)
{
@@ -771,10 +776,6 @@ static int can_set_xattr(struct inode *inode, const char *name,
strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN))
return -EOPNOTSUPP;
- if (!S_ISREG(inode->i_mode) &&
- (!S_ISDIR(inode->i_mode) || inode->i_mode &S_ISVTX))
- return -EPERM;
-
return 0;
}