summaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-07 10:35:28 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-07 10:35:28 +0200
commit4b4b20852d1009c5e8bc357b22353b62e3a241c7 (patch)
tree1026418471fe10c5b9f2fdff8a6b49bf070938fc /fs/nfs/inode.c
parent5130213721d01b6632c255d4295a8102cbb58379 (diff)
parentf00c0afdfa625165a609513bc74164d56752ec3e (diff)
downloadlinux-stable-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.gz
linux-stable-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.bz2
linux-stable-4b4b20852d1009c5e8bc357b22353b62e3a241c7.zip
Merge branch 'timers/fast-wheel' into timers/core
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r--fs/nfs/inode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 52e7d6869e3b..dda689d7a8a7 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -282,6 +282,7 @@ nfs_init_locked(struct inode *inode, void *opaque)
struct nfs_fattr *fattr = desc->fattr;
set_nfs_fileid(inode, fattr->fileid);
+ inode->i_mode = fattr->mode;
nfs_copy_fh(NFS_FH(inode), desc->fh);
return 0;
}