Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fix from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix revalidation test in cifs_llseek()
parents bc46f937 48a5730e

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin) 
	 * origin == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate

	 * the cached file length

	 */

	if (origin != SEEK_SET || origin != SEEK_CUR) {

	if (origin != SEEK_SET && origin != SEEK_CUR) {

		int rc;

		struct inode *inode = file->f_path.dentry->d_inode;