Skip to content

Commit 70536bf

Browse files
author
Trond Myklebust
committed
NFS: Clean up reset of the mirror accounting variables
Now that nfs_pageio_do_add_request() resets the pg_count, we don't need these other inlined resets. Signed-off-by: Trond Myklebust <[email protected]>
1 parent 0d0ea30 commit 70536bf

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

fs/nfs/pagelist.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,12 +1132,8 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
11321132
int error = desc->pg_ops->pg_doio(desc);
11331133
if (error < 0)
11341134
desc->pg_error = error;
1135-
if (list_empty(&mirror->pg_list)) {
1135+
if (list_empty(&mirror->pg_list))
11361136
mirror->pg_bytes_written += mirror->pg_count;
1137-
mirror->pg_count = 0;
1138-
mirror->pg_base = 0;
1139-
mirror->pg_recoalesce = 0;
1140-
}
11411137
}
11421138
}
11431139

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

12281224
do {
12291225
list_splice_init(&mirror->pg_list, &head);
1230-
mirror->pg_count = 0;
1231-
mirror->pg_base = 0;
1232-
mirror->pg_recoalesce = 0;
12331226

12341227
while (!list_empty(&head)) {
12351228
struct nfs_page *req;

0 commit comments

Comments
 (0)