Skip to content

Commit 02e61ec

Browse files
Christoph Hellwigamschuma-ntap
authored andcommitted
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: Christoph Hellwig <[email protected]> Reviewed-by: Sagi Grimberg <[email protected]> Signed-off-by: Anna Schumaker <[email protected]>
1 parent 7e8e78a commit 02e61ec

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

fs/nfs/write.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,6 @@ nfs_cancel_remove_inode(struct nfs_page *req, struct inode *inode)
169169
return 0;
170170
}
171171

172-
static struct nfs_page *nfs_folio_private_request(struct folio *folio)
173-
{
174-
return folio_get_private(folio);
175-
}
176-
177172
/**
178173
* nfs_folio_find_head_request - find head request associated with a folio
179174
* @folio: pointer to folio
@@ -190,7 +185,7 @@ static struct nfs_page *nfs_folio_find_head_request(struct folio *folio)
190185
if (!folio_test_private(folio))
191186
return NULL;
192187
spin_lock(&mapping->i_private_lock);
193-
req = nfs_folio_private_request(folio);
188+
req = folio->private;
194189
if (req) {
195190
WARN_ON_ONCE(req->wb_head != req);
196191
kref_get(&req->wb_kref);
@@ -220,7 +215,7 @@ static struct nfs_page *nfs_folio_find_and_lock_request(struct folio *folio)
220215
return ERR_PTR(ret);
221216
}
222217
/* Ensure that nobody removed the request before we locked it */
223-
if (head == nfs_folio_private_request(folio))
218+
if (head == folio->private)
224219
break;
225220
nfs_unlock_and_release_request(head);
226221
}

0 commit comments

Comments
 (0)