git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
fs
/
nfs
/
file.c
diff --git
a/fs/nfs/file.c
b/fs/nfs/file.c
index
eca56d4
..
606ef0f
100644
(file)
--- a/
fs/nfs/file.c
+++ b/
fs/nfs/file.c
@@
-147,7
+147,7
@@
static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
* origin == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate
* the cached file length
*/
* 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) {
struct inode *inode = filp->f_mapping->host;
int retval = nfs_revalidate_file_size(inode, filp);
struct inode *inode = filp->f_mapping->host;
int retval = nfs_revalidate_file_size(inode, filp);