Commit fb0155a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-5.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 "Highlights include:

   - NFSv4.2: copy_file_range needs to invalidate caches on success

   - NFSv4.2: Fix security label length not being reset

   - pNFS/flexfiles: Ensure we initialise the mirror bsizes correctly
     on read

   - pNFS/flexfiles: Fix signed/unsigned type issues with mirror
     indices"

* tag 'nfs-for-5.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  pNFS/flexfiles: Be consistent about mirror index types
  pNFS/flexfiles: Ensure we initialise the mirror bsizes correctly on read
  NFSv4.2: fix client's attribute cache management for copy_file_range
  nfs: Fix security label length not being reset
parents a4d63c37 b9df46d0

fs/nfs/dir.c

+3 −0
Original line number Diff line number Diff line
@@ -579,6 +579,9 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *en 
	xdr_set_scratch_buffer(&stream, page_address(scratch), PAGE_SIZE);



	do {

		if (entry->label)

			entry->label->len = NFS4_MAXLABELLEN;



		status = xdr_decode(desc, entry, &stream);

		if (status != 0) {

			if (status == -EAGAIN)

fs/nfs/flexfilelayout/flexfilelayout.c

+22 −21
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ nfs4_ff_layout_stat_io_end_write(struct rpc_task *task, 
}



static void

ff_layout_mark_ds_unreachable(struct pnfs_layout_segment *lseg, int idx)

ff_layout_mark_ds_unreachable(struct pnfs_layout_segment *lseg, u32 idx)

{

	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);
@@ -724,7 +724,7 @@ ff_layout_mark_ds_unreachable(struct pnfs_layout_segment *lseg, int idx) 
}



static void

ff_layout_mark_ds_reachable(struct pnfs_layout_segment *lseg, int idx)

ff_layout_mark_ds_reachable(struct pnfs_layout_segment *lseg, u32 idx)

{

	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);
@@ -734,14 +734,14 @@ ff_layout_mark_ds_reachable(struct pnfs_layout_segment *lseg, int idx) 


static struct nfs4_pnfs_ds *

ff_layout_choose_ds_for_read(struct pnfs_layout_segment *lseg,

			     int start_idx, int *best_idx,

			     u32 start_idx, u32 *best_idx,

			     bool check_device)

{

	struct nfs4_ff_layout_segment *fls = FF_LAYOUT_LSEG(lseg);

	struct nfs4_ff_layout_mirror *mirror;

	struct nfs4_pnfs_ds *ds;

	bool fail_return = false;

	int idx;

	u32 idx;



	/* mirrors are initially sorted by efficiency */

	for (idx = start_idx; idx < fls->mirror_array_cnt; idx++) {
@@ -766,21 +766,21 @@ ff_layout_choose_ds_for_read(struct pnfs_layout_segment *lseg, 


static struct nfs4_pnfs_ds *

ff_layout_choose_any_ds_for_read(struct pnfs_layout_segment *lseg,

				 int start_idx, int *best_idx)

				 u32 start_idx, u32 *best_idx)

{

	return ff_layout_choose_ds_for_read(lseg, start_idx, best_idx, false);

}



static struct nfs4_pnfs_ds *

ff_layout_choose_valid_ds_for_read(struct pnfs_layout_segment *lseg,

				   int start_idx, int *best_idx)

				   u32 start_idx, u32 *best_idx)

{

	return ff_layout_choose_ds_for_read(lseg, start_idx, best_idx, true);

}



static struct nfs4_pnfs_ds *

ff_layout_choose_best_ds_for_read(struct pnfs_layout_segment *lseg,

				  int start_idx, int *best_idx)

				  u32 start_idx, u32 *best_idx)

{

	struct nfs4_pnfs_ds *ds;
@@ -791,7 +791,8 @@ ff_layout_choose_best_ds_for_read(struct pnfs_layout_segment *lseg, 
}



static struct nfs4_pnfs_ds *

ff_layout_get_ds_for_read(struct nfs_pageio_descriptor *pgio, int *best_idx)

ff_layout_get_ds_for_read(struct nfs_pageio_descriptor *pgio,

			  u32 *best_idx)

{

	struct pnfs_layout_segment *lseg = pgio->pg_lseg;

	struct nfs4_pnfs_ds *ds;
@@ -837,7 +838,7 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio, 
	struct nfs_pgio_mirror *pgm;

	struct nfs4_ff_layout_mirror *mirror;

	struct nfs4_pnfs_ds *ds;

	int ds_idx;

	u32 ds_idx, i;



retry:

	ff_layout_pg_check_layout(pgio, req);
@@ -863,14 +864,14 @@ retry: 
		goto retry;

	}



	mirror = FF_LAYOUT_COMP(pgio->pg_lseg, ds_idx);

	for (i = 0; i < pgio->pg_mirror_count; i++) {

		mirror = FF_LAYOUT_COMP(pgio->pg_lseg, i);

		pgm = &pgio->pg_mirrors[i];

		pgm->pg_bsize = mirror->mirror_ds->ds_versions[0].rsize;

	}



	pgio->pg_mirror_idx = ds_idx;



	/* read always uses only one mirror - idx 0 for pgio layer */

	pgm = &pgio->pg_mirrors[0];

	pgm->pg_bsize = mirror->mirror_ds->ds_versions[0].rsize;



	if (NFS_SERVER(pgio->pg_inode)->flags &

			(NFS_MOUNT_SOFT|NFS_MOUNT_SOFTERR))

		pgio->pg_maxretrans = io_maxretrans;
@@ -894,7 +895,7 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio, 
	struct nfs4_ff_layout_mirror *mirror;

	struct nfs_pgio_mirror *pgm;

	struct nfs4_pnfs_ds *ds;

	int i;

	u32 i;



retry:

	ff_layout_pg_check_layout(pgio, req);
@@ -1038,7 +1039,7 @@ static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs) 
static void ff_layout_resend_pnfs_read(struct nfs_pgio_header *hdr)

{

	u32 idx = hdr->pgio_mirror_idx + 1;

	int new_idx = 0;

	u32 new_idx = 0;



	if (ff_layout_choose_any_ds_for_read(hdr->lseg, idx + 1, &new_idx))

		ff_layout_send_layouterror(hdr->lseg);
@@ -1075,7 +1076,7 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task, 
					   struct nfs4_state *state,

					   struct nfs_client *clp,

					   struct pnfs_layout_segment *lseg,

					   int idx)

					   u32 idx)

{

	struct pnfs_layout_hdr *lo = lseg->pls_layout;

	struct inode *inode = lo->plh_inode;
@@ -1149,7 +1150,7 @@ reset: 
/* Retry all errors through either pNFS or MDS except for -EJUKEBOX */

static int ff_layout_async_handle_error_v3(struct rpc_task *task,

					   struct pnfs_layout_segment *lseg,

					   int idx)

					   u32 idx)

{

	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);
@@ -1184,7 +1185,7 @@ static int ff_layout_async_handle_error(struct rpc_task *task, 
					struct nfs4_state *state,

					struct nfs_client *clp,

					struct pnfs_layout_segment *lseg,

					int idx)

					u32 idx)

{

	int vers = clp->cl_nfs_mod->rpc_vers->number;
@@ -1211,7 +1212,7 @@ static int ff_layout_async_handle_error(struct rpc_task *task, 
}



static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,

					int idx, u64 offset, u64 length,

					u32 idx, u64 offset, u64 length,

					u32 *op_status, int opnum, int error)

{

	struct nfs4_ff_layout_mirror *mirror;
@@ -1809,7 +1810,7 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync) 
	loff_t offset = hdr->args.offset;

	int vers;

	struct nfs_fh *fh;

	int idx = hdr->pgio_mirror_idx;

	u32 idx = hdr->pgio_mirror_idx;



	mirror = FF_LAYOUT_COMP(lseg, idx);

	ds = nfs4_ff_layout_prepare_ds(lseg, mirror, true);

fs/nfs/nfs42proc.c

+9 −1
Original line number Diff line number Diff line
@@ -356,7 +356,15 @@ static ssize_t _nfs42_proc_copy(struct file *src, 


	truncate_pagecache_range(dst_inode, pos_dst,

				 pos_dst + res->write_res.count);



	spin_lock(&dst_inode->i_lock);

	NFS_I(dst_inode)->cache_validity |= (NFS_INO_REVAL_PAGECACHE |

			NFS_INO_REVAL_FORCED | NFS_INO_INVALID_SIZE |

			NFS_INO_INVALID_ATTR | NFS_INO_INVALID_DATA);

	spin_unlock(&dst_inode->i_lock);

	spin_lock(&src_inode->i_lock);

	NFS_I(src_inode)->cache_validity |= (NFS_INO_REVAL_PAGECACHE |

			NFS_INO_REVAL_FORCED | NFS_INO_INVALID_ATIME);

	spin_unlock(&src_inode->i_lock);

	status = res->write_res.count;

out:

	if (args->sync)

include/linux/nfs_xdr.h

+2 −2
Original line number Diff line number Diff line
@@ -1611,8 +1611,8 @@ struct nfs_pgio_header { 
	__u64			mds_offset;	/* Filelayout dense stripe */

	struct nfs_page_array	page_array;

	struct nfs_client	*ds_clp;	/* pNFS data server */

	int			ds_commit_idx;	/* ds index if ds_clp is set */

	int			pgio_mirror_idx;/* mirror index in pgio layer */

	u32			ds_commit_idx;	/* ds index if ds_clp is set */

	u32			pgio_mirror_idx;/* mirror index in pgio layer */

};



struct nfs_mds_commit_info {

CRA Git | Maintained and supported by SUSTech CRA and CCSE