summaryrefslogtreecommitdiffstats
path: root/fs/nfs/pagelist.c
diff options
context:
space:
mode:
authorTrond Myklebust2012-05-09 20:04:55 +0200
committerTrond Myklebust2012-05-09 21:17:43 +0200
commit1d1afcbc294cc7c788eb5c7b6b98e8d63caf002c (patch)
tree88abc7e7018f733410fa51039351e4f0e2dd84c3 /fs/nfs/pagelist.c
parentNFS: Clean up - simplify nfs_lock_request() (diff)
downloadkernel-qcow2-linux-1d1afcbc294cc7c788eb5c7b6b98e8d63caf002c.tar.gz
kernel-qcow2-linux-1d1afcbc294cc7c788eb5c7b6b98e8d63caf002c.tar.xz
kernel-qcow2-linux-1d1afcbc294cc7c788eb5c7b6b98e8d63caf002c.zip
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>
Diffstat (limited to 'fs/nfs/pagelist.c')
-rw-r--r--fs/nfs/pagelist.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 69146f386989..aed913c833f4 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -128,10 +128,10 @@ nfs_create_request(struct nfs_open_context *ctx, struct inode *inode,
}
/**
- * nfs_unlock_request_dont_release - Unlock request and wake up sleepers.
+ * nfs_unlock_request - Unlock request and wake up sleepers.
* @req:
*/
-void nfs_unlock_request_dont_release(struct nfs_page *req)
+void nfs_unlock_request(struct nfs_page *req)
{
if (!NFS_WBACK_BUSY(req)) {
printk(KERN_ERR "NFS: Invalid unlock attempted\n");
@@ -144,11 +144,12 @@ void nfs_unlock_request_dont_release(struct nfs_page *req)
}
/**
- * nfs_unlock_request - Unlock request and release the nfs_page
+ * nfs_unlock_and_release_request - Unlock request and release the nfs_page
+ * @req:
*/
-void nfs_unlock_request(struct nfs_page *req)
+void nfs_unlock_and_release_request(struct nfs_page *req)
{
- nfs_unlock_request_dont_release(req);
+ nfs_unlock_request(req);
nfs_release_request(req);
}