summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2005-10-30 15:02:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:37:18 -0800
commit42e50a5a69f359e64a143eb0e11a57e18f10c262 (patch)
tree59912bfeeda4fdd34e4a586ecfa58969bd9cffda /fs
parenta92897286485735e3708af357f8bcaf0592bd77a (diff)
downloadlinux-42e50a5a69f359e64a143eb0e11a57e18f10c262.tar.gz
linux-42e50a5a69f359e64a143eb0e11a57e18f10c262.tar.bz2
linux-42e50a5a69f359e64a143eb0e11a57e18f10c262.zip
[PATCH] open: cleanup in lookup_flags()
lookup_flags() is only called from the non-create case, so it needn't check for O_CREAT|O_EXCL. Signed-off-by: Miklos Szeredi <miklos@szeredi.hu> Cc: Al Viro <viro@ftp.linux.org.uk> Cc: 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')
-rw-r--r--fs/namei.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c
index aaaa81036234..c5769c4fcab1 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1311,9 +1311,6 @@ static inline int may_create(struct inode *dir, struct dentry *child,
}
/*
- * Special case: O_CREAT|O_EXCL implies O_NOFOLLOW for security
- * reasons.
- *
* O_DIRECTORY translates into forcing a directory lookup.
*/
static inline int lookup_flags(unsigned int f)
@@ -1323,9 +1320,6 @@ static inline int lookup_flags(unsigned int f)
if (f & O_NOFOLLOW)
retval &= ~LOOKUP_FOLLOW;
- if ((f & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL))
- retval &= ~LOOKUP_FOLLOW;
-
if (f & O_DIRECTORY)
retval |= LOOKUP_DIRECTORY;