Skip to content

Commit

Permalink
NFS: Clean up reset of the mirror accounting variables
Browse files Browse the repository at this point in the history
Now that nfs_pageio_do_add_request() resets the pg_count, we don't need
these other inlined resets.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
  • Loading branch information
Trond Myklebust committed May 26, 2021
1 parent 0d0ea30 commit 70536bf
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions fs/nfs/pagelist.c
Original file line number Diff line number Diff line change
Expand Up @@ -1132,12 +1132,8 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
int error = desc->pg_ops->pg_doio(desc);
if (error < 0)
desc->pg_error = error;
if (list_empty(&mirror->pg_list)) {
if (list_empty(&mirror->pg_list))
mirror->pg_bytes_written += mirror->pg_count;
mirror->pg_count = 0;
mirror->pg_base = 0;
mirror->pg_recoalesce = 0;
}
}
}

Expand Down Expand Up @@ -1227,9 +1223,6 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)

do {
list_splice_init(&mirror->pg_list, &head);
mirror->pg_count = 0;
mirror->pg_base = 0;
mirror->pg_recoalesce = 0;

while (!list_empty(&head)) {
struct nfs_page *req;
Expand Down

0 comments on commit 70536bf

Please sign in to comment.