diff options
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, | |||
1311 | } | 1311 | } |
1312 | 1312 | ||
1313 | /* | 1313 | /* |
1314 | * Special case: O_CREAT|O_EXCL implies O_NOFOLLOW for security | ||
1315 | * reasons. | ||
1316 | * | ||
1317 | * O_DIRECTORY translates into forcing a directory lookup. | 1314 | * O_DIRECTORY translates into forcing a directory lookup. |
1318 | */ | 1315 | */ |
1319 | static inline int lookup_flags(unsigned int f) | 1316 | static inline int lookup_flags(unsigned int f) |
@@ -1323,9 +1320,6 @@ static inline int lookup_flags(unsigned int f) | |||
1323 | if (f & O_NOFOLLOW) | 1320 | if (f & O_NOFOLLOW) |
1324 | retval &= ~LOOKUP_FOLLOW; | 1321 | retval &= ~LOOKUP_FOLLOW; |
1325 | 1322 | ||
1326 | if ((f & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL)) | ||
1327 | retval &= ~LOOKUP_FOLLOW; | ||
1328 | |||
1329 | if (f & O_DIRECTORY) | 1323 | if (f & O_DIRECTORY) |
1330 | retval |= LOOKUP_DIRECTORY; | 1324 | retval |= LOOKUP_DIRECTORY; |
1331 | 1325 | ||