summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-03-17 22:16:40 +0000
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-15 15:05:30 -0400
commit4bbcbd3b11dbc676a272be508e47d1c4a5056349 (patch)
tree2672c860238fac8efb1cea46a74cdbb99284e620
parent7ceab50c0be56cf1bbaf2b3dd1c6cda80e5335fb (diff)
VFS: Make pathwalk use d_is_reg() rather than S_ISREG()
Make pathwalk use d_is_reg() rather than S_ISREG() to determine whether to honour O_TRUNC. Since this occurs after complete_walk(), the dentry type field cannot change and the inode pointer cannot change as we hold a ref on the dentry, so this should be safe. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 5a9291c31881..ffab2e06e147 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3077,7 +3077,7 @@ finish_open:
error = -ENOTDIR;
if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry))
goto out;
- if (!S_ISREG(nd->inode->i_mode))
+ if (!d_is_reg(nd->path.dentry))
will_truncate = false;
if (will_truncate) {