NFS: Cleanup nfs_direct_complete()

There is only one caller that sets the "write" argument to true,
so just move the call to nfs_zap_mapping() and get rid of the
now redundant argument.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 6d0e88096440f055e8c75e8c7cb3abbda7d89a39..c16d33eb1ddf90880a1c2e127c8c11239713e7be 100644 (file)
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -372,13 +372,10 @@ static ssize_t nfs_direct_wait(struct nfs_direct_req *dreq)
  * Synchronous I/O uses a stack-allocated iocb.  Thus we can't trust
  * the iocb is still valid here if this is a synchronous request.
  */
-static void nfs_direct_complete(struct nfs_direct_req *dreq, bool write)
+static void nfs_direct_complete(struct nfs_direct_req *dreq)
 {
        struct inode *inode = dreq->inode;
 
-       if (write)
-               nfs_zap_mapping(inode, inode->i_mapping);
-
        inode_dio_end(inode);
 
        if (dreq->iocb) {
@@ -431,7 +428,7 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)
        }
 out_put:
        if (put_dreq(dreq))
-               nfs_direct_complete(dreq, false);
+               nfs_direct_complete(dreq);
        hdr->release(hdr);
 }
 
@@ -537,7 +534,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,
        }
 
        if (put_dreq(dreq))
-               nfs_direct_complete(dreq, false);
+               nfs_direct_complete(dreq);
        return 0;
 }
 
@@ -764,7 +761,8 @@ static void nfs_direct_write_schedule_work(struct work_struct *work)
                        nfs_direct_write_reschedule(dreq);
                        break;
                default:
-                       nfs_direct_complete(dreq, true);
+                       nfs_zap_mapping(dreq->inode, dreq->inode->i_mapping);
+                       nfs_direct_complete(dreq);
        }
 }