[PATCH] NFS: Deal with failure of invalidate_inode_pages2()

If invalidate_inode_pages2() fails, then it should in principle just be
because the current process was signalled.  In that case, we just want to
ensure that the inode's page cache remains marked as invalid.

Also add a helper to allow the O_DIRECT code to simply mark the page cache as
invalid once it is finished writing, instead of calling
invalidate_inode_pages2() itself.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 23 insertions, 5 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index bc9376ca86cd..9979ad1cf8eb 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -131,6 +131,15 @@ void nfs_zap_caches(struct inode *inode)
         spin_unlock(&inode->i_lock);
 }
 
+void nfs_zap_mapping(struct inode *inode, struct address_space *mapping)
+{
+        if (mapping->nrpages != 0) {
+                spin_lock(&inode->i_lock);
+                NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA;
+                spin_unlock(&inode->i_lock);
+        }
+}
+
 static void nfs_zap_acl_cache(struct inode *inode)
 {
         void (*clear_acl_cache)(struct inode *);
@@ -671,13 +680,20 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
         if ((nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE)
                         || nfs_attribute_timeout(inode))
                 ret = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
+        if (ret < 0)
+                goto out;
 
         if (nfsi->cache_validity & NFS_INO_INVALID_DATA) {
-                nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);
-                if (S_ISREG(inode->i_mode))
-                        nfs_sync_mapping(mapping);
-                invalidate_inode_pages2(mapping);
-
+                if (mapping->nrpages != 0) {
+                        if (S_ISREG(inode->i_mode)) {
+                                ret = nfs_sync_mapping(mapping);
+                                if (ret < 0)
+                                        goto out;
+                        }
+                        ret = invalidate_inode_pages2(mapping);
+                        if (ret < 0)
+                                goto out;
+                }
                 spin_lock(&inode->i_lock);
                 nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
                 if (S_ISDIR(inode->i_mode)) {
@@ -687,10 +703,12 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
                 }
                 spin_unlock(&inode->i_lock);
 
+                nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);
                 dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",
                                 inode->i_sb->s_id,
                                 (long long)NFS_FILEID(inode));
         }
+out:
         return ret;
 }