diff options
author | Bob Peterson <rpeterso@redhat.com> | 2018-01-19 00:17:13 +0300 |
---|---|---|
committer | Bob Peterson <rpeterso@redhat.com> | 2018-01-19 00:17:13 +0300 |
commit | 786ebd9f68cdf512f389e5f2d0015f1beb0777d8 (patch) | |
tree | b4bae82884c2232f891aec11e58b38eb4fec5e5d /fs/cifs/inode.c | |
parent | 1f23bc7869fffec40b8bd9333a74a18d1de54d98 (diff) | |
parent | 4e56a6411fbce6f859566e17298114c2434391a4 (diff) | |
download | linux-786ebd9f68cdf512f389e5f2d0015f1beb0777d8.tar.xz |
Merge branch 'punch-hole' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 7c732cb44164..ecb99079363a 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -985,7 +985,7 @@ retry_iget5_locked: } cifs_fattr_to_inode(inode, fattr); - if (sb->s_flags & MS_NOATIME) + if (sb->s_flags & SB_NOATIME) inode->i_flags |= S_NOATIME | S_NOCMTIME; if (inode->i_state & I_NEW) { inode->i_ino = hash; |