NFS: Clean up - Rename nfs_unlock_request and nfs_unlock_request_dont_release

Function rename to ensure that the functionality of nfs_unlock_request()
mirrors that of nfs_lock_request(). Then let nfs_unlock_and_release_request()
do the work of what used to be called nfs_unlock_request()...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 465ea84a2874..845e20196803 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -488,7 +488,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
 
         while (!list_empty(&failed)) {
                 nfs_release_request(req);
-                nfs_unlock_request(req);
+                nfs_unlock_and_release_request(req);
         }
 
         if (put_dreq(dreq))
@@ -521,7 +521,7 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)
                         nfs_mark_request_commit(req, NULL, &cinfo);
                 } else
                         nfs_release_request(req);
-                nfs_unlock_request(req);
+                nfs_unlock_and_release_request(req);
         }
 
         if (atomic_dec_and_test(&cinfo.mds->rpcs_out))
@@ -662,7 +662,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d
                         req->wb_offset = pos & ~PAGE_MASK;
                         if (!nfs_pageio_add_request(desc, req)) {
                                 result = desc->pg_error;
-                                nfs_unlock_request(req);
+                                nfs_unlock_and_release_request(req);
                                 nfs_release_request(req);
                                 break;
                         }
@@ -739,7 +739,7 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
                 default:
                         nfs_release_request(req);
                 }
-                nfs_unlock_request(req);
+                nfs_unlock_and_release_request(req);
         }
 
 out_put:
@@ -756,7 +756,7 @@ static void nfs_write_sync_pgio_error(struct list_head *head)
                 req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
                 nfs_release_request(req);
-                nfs_unlock_request(req);
+                nfs_unlock_and_release_request(req);
         }
 }