summaryrefslogtreecommitdiffstats
path: root/fs/nfs/pagelist.c
diff options
context:
space:
mode:
authorFred Isaman <iisaman@netapp.com>2012-03-08 17:29:34 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-10 17:13:58 -0500
commit9994b62b5621f88828d442fcd03fe3ce4c43344b (patch)
treeb337f13fa873d0931b81f6e9a51ac739e6e074f1 /fs/nfs/pagelist.c
parentad1e3968292e3af1c49ccbd0fb7d2674010f8efc (diff)
downloadop-kernel-dev-9994b62b5621f88828d442fcd03fe3ce4c43344b.zip
op-kernel-dev-9994b62b5621f88828d442fcd03fe3ce4c43344b.tar.gz
NFS: remove NFS_PAGE_TAG_LOCKED
The last real use of this tag was removed by commit 7f2f12d963 NFS: Simplify nfs_wb_page() Signed-off-by: Fred Isaman <iisaman@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/pagelist.c')
-rw-r--r--fs/nfs/pagelist.c32
1 files changed, 1 insertions, 31 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 77a184e..fc5b54b 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -107,36 +107,6 @@ void nfs_unlock_request(struct nfs_page *req)
nfs_release_request(req);
}
-/**
- * nfs_set_page_tag_locked - Tag a request as locked
- * @req:
- */
-int nfs_set_page_tag_locked(struct nfs_page *req)
-{
- if (!nfs_lock_request_dontget(req))
- return 0;
- if (test_bit(PG_MAPPED, &req->wb_flags))
- radix_tree_tag_set(&NFS_I(req->wb_context->dentry->d_inode)->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED);
- return 1;
-}
-
-/**
- * nfs_clear_page_tag_locked - Clear request tag and wake up sleepers
- */
-void nfs_clear_page_tag_locked(struct nfs_page *req)
-{
- if (test_bit(PG_MAPPED, &req->wb_flags)) {
- struct inode *inode = req->wb_context->dentry->d_inode;
- struct nfs_inode *nfsi = NFS_I(inode);
-
- spin_lock(&inode->i_lock);
- radix_tree_tag_clear(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED);
- nfs_unlock_request(req);
- spin_unlock(&inode->i_lock);
- } else
- nfs_unlock_request(req);
-}
-
/*
* nfs_clear_request - Free up all resources allocated to the request
* @req:
@@ -469,7 +439,7 @@ int nfs_scan_list(struct nfs_inode *nfsi,
if (req->wb_index > idx_end)
goto out;
idx_start = req->wb_index + 1;
- if (nfs_set_page_tag_locked(req)) {
+ if (nfs_lock_request_dontget(req)) {
kref_get(&req->wb_kref);
radix_tree_tag_clear(&nfsi->nfs_page_tree,
req->wb_index, tag);
OpenPOWER on IntegriCloud