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/inode.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/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 0cc7eddb077f..de02ed5e25c2 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -1805,8 +1805,10 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry, | |||
1805 | if (!CIFS_I(inode)->clientCanCacheRead && inode->i_mapping && | 1805 | if (!CIFS_I(inode)->clientCanCacheRead && inode->i_mapping && |
1806 | inode->i_mapping->nrpages != 0) { | 1806 | inode->i_mapping->nrpages != 0) { |
1807 | rc = filemap_fdatawait(inode->i_mapping); | 1807 | rc = filemap_fdatawait(inode->i_mapping); |
1808 | mapping_set_error(inode->i_mapping, rc); | 1808 | if (rc) { |
1809 | return rc; | 1809 | mapping_set_error(inode->i_mapping, rc); |
1810 | return rc; | ||
1811 | } | ||
1810 | } | 1812 | } |
1811 | 1813 | ||
1812 | rc = cifs_revalidate_dentry_attr(dentry); | 1814 | rc = cifs_revalidate_dentry_attr(dentry); |