Commit 5ff2756a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-5.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
"Stable fixes:
   - Fix v4.0/v4.1 SEEK_DATA return -ENOTSUPP when set NFS_V4_2 config
   - Fix Oops in xs_tcp_send_request() when transport is disconnected
   - Fix a NULL pointer dereference in pnfs_mark_matching_lsegs_return()

  Bugfixes:
   - Fix instances where signal_pending() should be fatal_signal_pending()
   - fix an incorrect limit in filelayout_decode_layout()
   - Fixes for the SUNRPC backlogged RPC queue
   - Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce()
   - Revert commit 586a0787 ("Clean up rpcrdma_prepare_readch()")"

* tag 'nfs-for-5.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: Remove trailing semicolon in macros
  xprtrdma: Revert 586a0787
  NFSv4: Fix v4.0/v4.1 SEEK_DATA return -ENOTSUPP when set NFS_V4_2 config
  NFS: Clean up reset of the mirror accounting variables
  NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce()
  NFS: Fix an Oopsable condition in __nfs_pageio_add_request()
  SUNRPC: More fixes for backlog congestion
  SUNRPC: Fix Oops in xs_tcp_send_request() when transport is disconnected
  NFSv4: Fix a NULL pointer dereference in pnfs_mark_matching_lsegs_return()
  SUNRPC in case of backlog, hand free slots directly to waiting task
  pNFS/NFSv4: Remove redundant initialization of 'rd_size'
  NFS: fix an incorrect limit in filelayout_decode_layout()
  fs/nfs: Use fatal_signal_pending instead of signal_pending
parents fc683f96 a799b68a

fs/nfs/filelayout/filelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, 
		if (unlikely(!p))

			goto out_err;

		fl->fh_array[i]->size = be32_to_cpup(p++);

		if (sizeof(struct nfs_fh) < fl->fh_array[i]->size) {

		if (fl->fh_array[i]->size > NFS_MAXFHSIZE) {

			printk(KERN_ERR "NFS: Too big fh %d received %d\n",

			       i, fl->fh_array[i]->size);

			goto out_err;

fs/nfs/namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static const struct kernel_param_ops param_ops_nfs_timeout = { 
	.set = param_set_nfs_timeout,

	.get = param_get_nfs_timeout,

};

#define param_check_nfs_timeout(name, p) __param_check(name, p, int);

#define param_check_nfs_timeout(name, p) __param_check(name, p, int)



module_param(nfs_mountpoint_expiry_timeout, nfs_timeout, 0644);

MODULE_PARM_DESC(nfs_mountpoint_expiry_timeout,

fs/nfs/nfs4file.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static loff_t nfs4_file_llseek(struct file *filep, loff_t offset, int whence) 
	case SEEK_HOLE:

	case SEEK_DATA:

		ret = nfs42_proc_llseek(filep, offset, whence);

		if (ret != -ENOTSUPP)

		if (ret != -EOPNOTSUPP)

			return ret;

		fallthrough;

	default:

fs/nfs/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -1706,7 +1706,7 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state, 
		rcu_read_unlock();

		trace_nfs4_open_stateid_update_wait(state->inode, stateid, 0);



		if (!signal_pending(current)) {

		if (!fatal_signal_pending(current)) {

			if (schedule_timeout(5*HZ) == 0)

				status = -EAGAIN;

			else
@@ -3487,7 +3487,7 @@ static bool nfs4_refresh_open_old_stateid(nfs4_stateid *dst, 
		write_sequnlock(&state->seqlock);

		trace_nfs4_close_stateid_update_wait(state->inode, dst, 0);



		if (signal_pending(current))

		if (fatal_signal_pending(current))

			status = -EINTR;

		else

			if (schedule_timeout(5*HZ) != 0)

fs/nfs/pagelist.c

+6 −14
Original line number Diff line number Diff line
@@ -1094,15 +1094,16 @@ nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc, 
	struct nfs_page *prev = NULL;

	unsigned int size;



	if (mirror->pg_count != 0) {

		prev = nfs_list_entry(mirror->pg_list.prev);

	} else {

	if (list_empty(&mirror->pg_list)) {

		if (desc->pg_ops->pg_init)

			desc->pg_ops->pg_init(desc, req);

		if (desc->pg_error < 0)

			return 0;

		mirror->pg_base = req->wb_pgbase;

	}

		mirror->pg_count = 0;

		mirror->pg_recoalesce = 0;

	} else

		prev = nfs_list_entry(mirror->pg_list.prev);



	if (desc->pg_maxretrans && req->wb_nio > desc->pg_maxretrans) {

		if (NFS_SERVER(desc->pg_inode)->flags & NFS_MOUNT_SOFTERR)
@@ -1127,18 +1128,13 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc) 
{

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);





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

		int error = desc->pg_ops->pg_doio(desc);

		if (error < 0)

			desc->pg_error = error;

		else

		if (list_empty(&mirror->pg_list))

			mirror->pg_bytes_written += mirror->pg_count;

	}

	if (list_empty(&mirror->pg_list)) {

		mirror->pg_count = 0;

		mirror->pg_base = 0;

	}

}



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


	do {

		list_splice_init(&mirror->pg_list, &head);

		mirror->pg_bytes_written -= mirror->pg_count;

		mirror->pg_count = 0;

		mirror->pg_base = 0;

		mirror->pg_recoalesce = 0;



		while (!list_empty(&head)) {

			struct nfs_page *req;