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 <[email protected]>
Signed-off-by: Al Viro <[email protected]>

diff --git a/fs/namei.c b/fs/namei.c
index 5a9291c318815b1b53f770be9af7e92bad263e3a..ffab2e06e1472eca41449cbe5d8fe22baa219d29 100644 (file)
--- 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) {