diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2005-10-31 02:02:09 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 04:37:18 +0300 |
| commit | 42e50a5a69f359e64a143eb0e11a57e18f10c262 (patch) | |
| tree | 59912bfeeda4fdd34e4a586ecfa58969bd9cffda /fs/namei.c | |
| parent | a92897286485735e3708af357f8bcaf0592bd77a (diff) | |
| download | linux-42e50a5a69f359e64a143eb0e11a57e18f10c262.tar.xz | |
[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/namei.c')
| -rw-r--r-- | fs/namei.c | 6 |
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; |