Commit 02e61ec1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Anna Schumaker

nfs: remove nfs_folio_private_request

nfs_folio_private_request is a trivial wrapper around, which itself has
fallen out of favor and has been replaced with plain ->private
dereferences in recent folio conversions.  Do the same for nfs.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 7e8e78a0
...@@ -169,11 +169,6 @@ nfs_cancel_remove_inode(struct nfs_page *req, struct inode *inode) ...@@ -169,11 +169,6 @@ nfs_cancel_remove_inode(struct nfs_page *req, struct inode *inode)
return 0; return 0;
} }
static struct nfs_page *nfs_folio_private_request(struct folio *folio)
{
return folio_get_private(folio);
}
/** /**
* nfs_folio_find_head_request - find head request associated with a folio * nfs_folio_find_head_request - find head request associated with a folio
* @folio: pointer to folio * @folio: pointer to folio
...@@ -190,7 +185,7 @@ static struct nfs_page *nfs_folio_find_head_request(struct folio *folio) ...@@ -190,7 +185,7 @@ static struct nfs_page *nfs_folio_find_head_request(struct folio *folio)
if (!folio_test_private(folio)) if (!folio_test_private(folio))
return NULL; return NULL;
spin_lock(&mapping->i_private_lock); spin_lock(&mapping->i_private_lock);
req = nfs_folio_private_request(folio); req = folio->private;
if (req) { if (req) {
WARN_ON_ONCE(req->wb_head != req); WARN_ON_ONCE(req->wb_head != req);
kref_get(&req->wb_kref); kref_get(&req->wb_kref);
...@@ -220,7 +215,7 @@ static struct nfs_page *nfs_folio_find_and_lock_request(struct folio *folio) ...@@ -220,7 +215,7 @@ static struct nfs_page *nfs_folio_find_and_lock_request(struct folio *folio)
return ERR_PTR(ret); return ERR_PTR(ret);
} }
/* Ensure that nobody removed the request before we locked it */ /* Ensure that nobody removed the request before we locked it */
if (head == nfs_folio_private_request(folio)) if (head == folio->private)
break; break;
nfs_unlock_and_release_request(head); nfs_unlock_and_release_request(head);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment