aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-11-07 03:59:26 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:53:37 -0500
commitd8ba3b731086bcae5468f9ea509f39a921b3f9a6 (patch)
treecf75a8ea1bad960b431dccceae83b4ac09729399
parent274b69335d8f18fe198af2d939331f01fec70659 (diff)
[PATCH] fuse: remove dead code from fuse_permission
The -EROFS check has moved up to permission() in the VFS a while ago. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Miklos Szeredi <miklos@szeredi.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/fuse/dir.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 70dba721acab..61b58fdd973e 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -491,9 +491,6 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd)
491 return err; 491 return err;
492 } else { 492 } else {
493 int mode = inode->i_mode; 493 int mode = inode->i_mode;
494 if ((mask & MAY_WRITE) && IS_RDONLY(inode) &&
495 (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
496 return -EROFS;
497 if ((mask & MAY_EXEC) && !S_ISDIR(mode) && !(mode & S_IXUGO)) 494 if ((mask & MAY_EXEC) && !S_ISDIR(mode) && !(mode & S_IXUGO))
498 return -EACCES; 495 return -EACCES;
499 return 0; 496 return 0;