[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>

diff --git a/fs/namei.c b/fs/namei.c
index aaaa810362344af7790e066a47a233100d491542..c5769c4fcab185ea1996e947c5b910abfd155dd5 100644 (file)
--- 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;