diff mbox series

pNFS: When updating the stateid in layoutreturn, also update the recall range

Message ID 20180814104759.20556-1-trond.myklebust@hammerspace.com (mailing list archive)
State New, archived
Headers show
Series pNFS: When updating the stateid in layoutreturn, also update the recall range | expand

Commit Message

Trond Myklebust Aug. 14, 2018, 10:47 a.m. UTC 
When we update the layout stateid in nfs4_layoutreturn_refresh_stateid, we
should also update the range in order to let the server know we're actually
returning everything.

Fixes: 16c278dbfa63 ("pnfs: Fix handling of NFS4ERR_OLD_STATEID replies...")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
 fs/nfs/nfs4proc.c | 3 +++
 fs/nfs/pnfs.c     | 5 ++++-
 fs/nfs/pnfs.h     | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

Comments

Schumaker, Anna Aug. 15, 2018, 3:19 p.m. UTC | #1 
Hi Trond,

On Tue, 2018-08-14 at 06:47 -0400, Trond Myklebust wrote:
> When we update the layout stateid in
> nfs4_layoutreturn_refresh_stateid, we
> should also update the range in order to let the server know we're
> actually
> returning everything.
> 
> Fixes: 16c278dbfa63 ("pnfs: Fix handling of NFS4ERR_OLD_STATEID
> replies...")
> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
> ---
>  fs/nfs/nfs4proc.c | 3 +++
>  fs/nfs/pnfs.c     | 5 ++++-
>  fs/nfs/pnfs.h     | 4 +++-
>  3 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 9a349587d077..a5f0de68e710 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -3246,6 +3246,7 @@ static void nfs4_close_done(struct rpc_task
> *task, void *data)
>  			break;
>  		case -NFS4ERR_OLD_STATEID:
>  			if
> (nfs4_layoutreturn_refresh_stateid(&calldata->arg.lr_args->stateid,
> +						&calldata->arg.lr_args-
> >range,
>  						calldata->inode))
>  				goto lr_restart;
>  			/* Fallthrough */
> @@ -5950,6 +5951,7 @@ static void nfs4_delegreturn_done(struct
> rpc_task *task, void *calldata)
>  			break;
>  		case -NFS4ERR_OLD_STATEID:
>  			if (nfs4_layoutreturn_refresh_stateid(&data-
> >args.lr_args->stateid,
> +						&data->args.lr_args-
> >range,
>  						data->inode))
>  				goto lr_restart;
>  			/* Fallthrough */
> @@ -8899,6 +8901,7 @@ static void nfs4_layoutreturn_done(struct
> rpc_task *task, void *calldata)
>  	switch (task->tk_status) {
>  	case -NFS4ERR_OLD_STATEID:
>  		if (nfs4_layoutreturn_refresh_stateid(&lrp-
> >args.stateid,
> +					&lrp->args.range,
>  					lrp->args.inode))
>  			goto out_restart;
>  		/* Fallthrough */
> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
> index 8f03bdb191aa..8ef3c1feee92 100644
> --- a/fs/nfs/pnfs.c
> +++ b/fs/nfs/pnfs.c
> @@ -361,7 +361,9 @@ pnfs_clear_lseg_state(struct pnfs_layout_segment
> *lseg,
>  /*
>   * Update the seqid of a layout stateid
>   */
> -bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct
> inode *inode)
> +bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst,
> +		struct pnfs_layout_range *dst_range,
> +		struct inode *inode)
>  {
>  	struct pnfs_layout_hdr *lo;
>  	struct pnfs_layout_range range = {
> @@ -379,6 +381,7 @@ bool
> nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct inode
> *inode)
>  		err = pnfs_mark_matching_lsegs_return(lo, &head,
> &range, 0);
>  		if (err != -EBUSY) {
>  			dst->seqid = lo->plh_stateid.seqid;
> +			*dst_range = range;
>  			ret = true;
>  		}
>  	}
> diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
> index 1a38a3b533b5..f490d19f7290 100644
> --- a/fs/nfs/pnfs.h
> +++ b/fs/nfs/pnfs.h
> @@ -259,7 +259,9 @@ int pnfs_destroy_layouts_byfsid(struct nfs_client
> *clp,
>  		bool is_recall);
>  int pnfs_destroy_layouts_byclid(struct nfs_client *clp,
>  		bool is_recall);
> -bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct
> inode *inode);
> +bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst,
> +		struct pnfs_layout_range *dst_range,
> +		struct inode *inode);

Can you please also update the function signature used when
CONFIG_NFS_V4_1=n?

Thanks,
Anna

>  void pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo);
>  void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo,
>  			     const nfs4_stateid *new,
diff mbox series

Patch

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 9a349587d077..a5f0de68e710 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3246,6 +3246,7 @@  static void nfs4_close_done(struct rpc_task *task, void *data)
 			break;
 		case -NFS4ERR_OLD_STATEID:
 			if (nfs4_layoutreturn_refresh_stateid(&calldata->arg.lr_args->stateid,
+						&calldata->arg.lr_args->range,
 						calldata->inode))
 				goto lr_restart;
 			/* Fallthrough */
@@ -5950,6 +5951,7 @@  static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
 			break;
 		case -NFS4ERR_OLD_STATEID:
 			if (nfs4_layoutreturn_refresh_stateid(&data->args.lr_args->stateid,
+						&data->args.lr_args->range,
 						data->inode))
 				goto lr_restart;
 			/* Fallthrough */
@@ -8899,6 +8901,7 @@  static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)
 	switch (task->tk_status) {
 	case -NFS4ERR_OLD_STATEID:
 		if (nfs4_layoutreturn_refresh_stateid(&lrp->args.stateid,
+					&lrp->args.range,
 					lrp->args.inode))
 			goto out_restart;
 		/* Fallthrough */
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 8f03bdb191aa..8ef3c1feee92 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -361,7 +361,9 @@  pnfs_clear_lseg_state(struct pnfs_layout_segment *lseg,
 /*
  * Update the seqid of a layout stateid
  */
-bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct inode *inode)
+bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst,
+		struct pnfs_layout_range *dst_range,
+		struct inode *inode)
 {
 	struct pnfs_layout_hdr *lo;
 	struct pnfs_layout_range range = {
@@ -379,6 +381,7 @@  bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct inode *inode)
 		err = pnfs_mark_matching_lsegs_return(lo, &head, &range, 0);
 		if (err != -EBUSY) {
 			dst->seqid = lo->plh_stateid.seqid;
+			*dst_range = range;
 			ret = true;
 		}
 	}
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 1a38a3b533b5..f490d19f7290 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -259,7 +259,9 @@  int pnfs_destroy_layouts_byfsid(struct nfs_client *clp,
 		bool is_recall);
 int pnfs_destroy_layouts_byclid(struct nfs_client *clp,
 		bool is_recall);
-bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct inode *inode);
+bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst,
+		struct pnfs_layout_range *dst_range,
+		struct inode *inode);
 void pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo);
 void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo,
 			     const nfs4_stateid *new,