Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11816
b: refs/heads/master
c: 42e50a5
h: refs/heads/master
v: v3
  • Loading branch information
Miklos Szeredi authored and Linus Torvalds committed Oct 31, 2005
1 parent 7ea5176 commit f835afc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a92897286485735e3708af357f8bcaf0592bd77a
refs/heads/master: 42e50a5a69f359e64a143eb0e11a57e18f10c262
6 changes: 0 additions & 6 deletions trunk/fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;

Expand Down

0 comments on commit f835afc

Please sign in to comment.