aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-04 08:11:20 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-04 08:11:20 -0800
commitaaa9b971398f62ab97c1da4f7c352667eb3452c9 (patch)
tree87f705ce9275b8c180184d29405a137c6e939af4
parenta0d2db26582a67b61f883d1469e561fbdef28419 (diff)
parentd572b87946f8c598b3cad86a7913862dd48daadb (diff)
downloadmrst-s0i3-test-aaa9b971398f62ab97c1da4f7c352667eb3452c9.tar.gz
mrst-s0i3-test-aaa9b971398f62ab97c1da4f7c352667eb3452c9.tar.xz
mrst-s0i3-test-aaa9b971398f62ab97c1da4f7c352667eb3452c9.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Remove redundant xattr permission checking
-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;
}