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>
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 465ea84..845e201 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -488,7 +488,7 @@
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 @@
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 @@
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 @@
default:
nfs_release_request(req);
}
- nfs_unlock_request(req);
+ nfs_unlock_and_release_request(req);
}
out_put:
@@ -756,7 +756,7 @@
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);
}
}