[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, 2 insertions, 11 deletions

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 1e873fcab947..bdfabf854a51 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -497,6 +497,7 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode
                         if (dreq->commit_data != NULL)
                                 nfs_commit_free(dreq->commit_data);
                         nfs_direct_free_writedata(dreq);
+                        nfs_zap_mapping(inode, inode->i_mapping);
                         nfs_direct_complete(dreq);
         }
 }
@@ -517,6 +518,7 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode
 {
         nfs_end_data_update(inode);
         nfs_direct_free_writedata(dreq);
+        nfs_zap_mapping(inode, inode->i_mapping);
         nfs_direct_complete(dreq);
 }
 #endif
@@ -830,17 +832,6 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
 
         retval = nfs_direct_write(iocb, (unsigned long) buf, count, pos);
 
-        /*
-         * XXX: nfs_end_data_update() already ensures this file's
-         *      cached data is subsequently invalidated.  Do we really
-         *      need to call invalidate_inode_pages2() again here?
-         *
-         *      For aio writes, this invalidation will almost certainly
-         *      occur before the writes complete.  Kind of racey.
-         */
-        if (mapping->nrpages)
-                invalidate_inode_pages2(mapping);
-
         if (retval > 0)
                 iocb->ki_pos = pos + retval;