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

Commit d8398fc1 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

nfsd: Set lc_size_chg before ops->proc_layoutcommit 



After proc_layoutcommit success, i_size_read(inode) always >= new_size.
Just set lc_size_chg before proc_layoutcommit, if proc_layoutcommit
failed, nfsd will skip the lc_size_chg, so it's no harm.

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 28e51af7

fs/nfsd/nfs4proc.c

+1 −5
Original line number Diff line number Diff line
@@ -1364,10 +1364,6 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp, 
		goto out;

	}



	nfserr = ops->proc_layoutcommit(inode, lcp);

	if (nfserr)

		goto out_put_stid;



	if (new_size > i_size_read(inode)) {

		lcp->lc_size_chg = 1;

		lcp->lc_newsize = new_size;
@@ -1375,7 +1371,7 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp, 
		lcp->lc_size_chg = 0;

	}



out_put_stid:

	nfserr = ops->proc_layoutcommit(inode, lcp);

	nfs4_put_stid(&ls->ls_stid);

out:

	return nfserr;