diff options
author | Steve French <sfrench@us.ibm.com> | 2011-05-20 13:00:01 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-05-20 13:00:01 -0400 |
commit | 156ecb2d8b06589098f6ce3012e6a10fef07c416 (patch) | |
tree | 4008ea00d8c49ff2361ebe784a1e757c8cad9986 /fs/cifs/cifsfs.c | |
parent | ceec1e0fae6eecac876ec28cfb97786f87dfb1c6 (diff) |
[CIFS] Fix to problem with getattr caused by invalidate simplification patch
Fix to earlier "Simplify invalidate part (try #6)" patch
That patch caused problems with connectathon test 5.
Reviewed-by: Jeff Layton <jlayton@samba.org>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index ed92c7d36378..493b74ca5648 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -617,8 +617,10 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin) | |||
617 | if (!CIFS_I(inode)->clientCanCacheRead && inode->i_mapping && | 617 | if (!CIFS_I(inode)->clientCanCacheRead && inode->i_mapping && |
618 | inode->i_mapping->nrpages != 0) { | 618 | inode->i_mapping->nrpages != 0) { |
619 | rc = filemap_fdatawait(inode->i_mapping); | 619 | rc = filemap_fdatawait(inode->i_mapping); |
620 | mapping_set_error(inode->i_mapping, rc); | 620 | if (rc) { |
621 | return rc; | 621 | mapping_set_error(inode->i_mapping, rc); |
622 | return rc; | ||
623 | } | ||
622 | } | 624 | } |
623 | /* | 625 | /* |
624 | * Some applications poll for the file length in this strange | 626 | * Some applications poll for the file length in this strange |