Commit 19726630 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2ddb5998 a87c9ad9

fs/cifs/inode.c

+3 −0
Original line number Diff line number Diff line
@@ -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;