summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-13 06:19:32 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-13 06:19:32 +0400
commit19726630c69eb373d6d5d4f3934c2ed540914344 (patch)
treea8410d1a9c8b3e8ad974687fb21e9d075a7ea65e /fs
parent2ddb5998d0538bc720288486af3af243af5bac0a (diff)
parenta87c9ad956676d84d459739fc14ec5a3c3565717 (diff)
downloadlinux-19726630c69eb373d6d5d4f3934c2ed540914344.tar.xz
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fix from Steve French: "Small cifs fix for metadata caching" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: cifs: fix actimeo=0 corner case when cifs_i->time == jiffies
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/inode.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index aadc2b68678b..a22d667f1069 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1737,6 +1737,9 @@ cifs_inode_needs_reval(struct inode *inode)
if (cifs_i->time == 0)
return true;
+ if (!cifs_sb->actimeo)
+ return true;
+
if (!time_in_range(jiffies, cifs_i->time,
cifs_i->time + cifs_sb->actimeo))
return true;