diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 14:59:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 14:59:02 -0700 |
| commit | fda27bed908bb8c1c9bdaceb6b49bc6b21fc5424 (patch) | |
| tree | 0c0ced4790e6efcddeff04154bc8f7a9fbe80fc0 | |
| parent | bc46f9375a286d05f84a9464efc2b7f1f5614ff4 (diff) | |
| parent | 48a5730e5b71201e226ff06e245bf308feba5f10 (diff) | |
| download | op-kernel-dev-fda27bed908bb8c1c9bdaceb6b49bc6b21fc5424.zip op-kernel-dev-fda27bed908bb8c1c9bdaceb6b49bc6b21fc5424.tar.gz | |
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()
| -rw-r--r-- | fs/cifs/cifsfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index ca6a379..541ef81 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -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; |
