diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-13 11:19:32 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-13 11:19:32 +0900 |
| commit | 19726630c69eb373d6d5d4f3934c2ed540914344 (patch) | |
| tree | a8410d1a9c8b3e8ad974687fb21e9d075a7ea65e /fs | |
| parent | 2ddb5998d0538bc720288486af3af243af5bac0a (diff) | |
| parent | a87c9ad956676d84d459739fc14ec5a3c3565717 (diff) | |
| download | linux-19726630c69eb373d6d5d4f3934c2ed540914344.tar.gz linux-19726630c69eb373d6d5d4f3934c2ed540914344.tar.bz2 linux-19726630c69eb373d6d5d4f3934c2ed540914344.zip | |
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.c | 3 |
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; |