projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/urgent, to merge dependent patch
[firefly-linux-kernel-4.4.55.git]
/
fs
/
9p
/
vfs_inode.c
diff --git
a/fs/9p/vfs_inode.c
b/fs/9p/vfs_inode.c
index 9ee5343d48849d85c1404538ce3f5433ad460d6a..3662f1d1d9cf0fc2f73c44fa4c34fb6e14c0af5f 100644
(file)
--- a/
fs/9p/vfs_inode.c
+++ b/
fs/9p/vfs_inode.c
@@
-1127,7
+1127,7
@@
static int v9fs_vfs_setattr(struct dentry *dentry, struct iattr *iattr)
}
/* Write all dirty data */
- if (
S_ISREG(dentry->d_inode->i_mode
))
+ if (
d_is_reg(dentry
))
filemap_write_and_wait(dentry->d_inode->i_mapping);
retval = p9_client_wstat(fid, &wstat);