Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36fe432d authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

NFSv4.1: Clear lseg pointer in ->doio function 



Now that we have access to the pointer, clear it immediately after
the put, instead of in caller.

Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent c76069bd

fs/nfs/pagelist.c

+0 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc) 
{

	if (!list_empty(&desc->pg_list)) {

		int error = desc->pg_doio(desc);

		desc->pg_lseg = NULL;

		if (error < 0)

			desc->pg_error = error;

		else

fs/nfs/read.c

+2 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc) 
		nbytes -= rsize;

	} while (nbytes != 0);

	put_lseg(lseg);

	desc->pg_lseg = NULL;



	return ret;
@@ -357,6 +358,7 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc) 
				0, lseg);

out:

	put_lseg(lseg);

	desc->pg_lseg = NULL;

	return ret;

}

fs/nfs/write.c

+2 −0
Original line number Diff line number Diff line
@@ -949,6 +949,7 @@ static int nfs_flush_multi(struct nfs_pageio_descriptor *desc) 
	} while (nbytes != 0);



	put_lseg(lseg);

	desc->pg_lseg = NULL;

	return ret;



out_bad:
@@ -1005,6 +1006,7 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc) 
	ret = nfs_write_rpcsetup(req, data, &nfs_write_full_ops, desc->pg_count, 0, lseg, desc->pg_ioflags);

out:

	put_lseg(lseg); /* Cleans any gotten in ->pg_test */

	desc->pg_lseg = NULL;

	return ret;

}