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

Commit 1e848913 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux 

Pull nfsd fixes from Bruce Fields:
 "Two main issues:

   - We found that turning on pNFS by default (when it's configured at
     build time) was too aggressive, so we want to switch the default
     before the 4.0 release.

   - Recent client changes to increase open parallelism uncovered a
     serious bug lurking in the server's open code.

  Also fix a krb5/selinux regression.

  The rest is mainly smaller pNFS fixes"

* 'for-4.0' of git://linux-nfs.org/~bfields/linux:
  sunrpc: make debugfs file creation failure non-fatal
  nfsd: require an explicit option to enable pNFS
  NFSD: Fix bad update of layout in nfsd4_return_file_layout
  NFSD: Take care the return value from nfsd4_encode_stateid
  NFSD: Printk blocklayout length and offset as format 0x%llx
  nfsd: return correct lockowner when there is a race on hash insert
  nfsd: return correct openowner when there is a race to put one in the hash
  NFSD: Put exports after nfsd4_layout_verify fail
  NFSD: Error out when register_shrinker() fail
  NFSD: Take care the return value from nfsd4_decode_stateid
  NFSD: Check layout type when returning client layouts
  NFSD: restore trace event lost in mismerge
parents 6c310bc1 f9c72d10

fs/nfsd/blocklayout.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp, 
	seg->offset = iomap.offset;

	seg->length = iomap.length;



	dprintk("GET: %lld:%lld %d\n", bex->foff, bex->len, bex->es);

	dprintk("GET: 0x%llx:0x%llx %d\n", bex->foff, bex->len, bex->es);

	return 0;



out_error:

fs/nfsd/blocklayoutxdr.c

+3 −3
Original line number Diff line number Diff line
@@ -122,19 +122,19 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp, 


		p = xdr_decode_hyper(p, &bex.foff);

		if (bex.foff & (block_size - 1)) {

			dprintk("%s: unaligned offset %lld\n",

			dprintk("%s: unaligned offset 0x%llx\n",

				__func__, bex.foff);

			goto fail;

		}

		p = xdr_decode_hyper(p, &bex.len);

		if (bex.len & (block_size - 1)) {

			dprintk("%s: unaligned length %lld\n",

			dprintk("%s: unaligned length 0x%llx\n",

				__func__, bex.foff);

			goto fail;

		}

		p = xdr_decode_hyper(p, &bex.soff);

		if (bex.soff & (block_size - 1)) {

			dprintk("%s: unaligned disk offset %lld\n",

			dprintk("%s: unaligned disk offset 0x%llx\n",

				__func__, bex.soff);

			goto fail;

		}

fs/nfsd/nfs4layouts.c

+8 −4
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void nfsd4_setup_layout_type(struct svc_export *exp) 
{

	struct super_block *sb = exp->ex_path.mnt->mnt_sb;



	if (exp->ex_flags & NFSEXP_NOPNFS)

	if (!(exp->ex_flags & NFSEXP_PNFS))

		return;



	if (sb->s_export_op->get_uuid &&
@@ -440,15 +440,14 @@ nfsd4_return_file_layout(struct nfs4_layout *lp, struct nfsd4_layout_seg *seg, 
			list_move_tail(&lp->lo_perstate, reaplist);

			return;

		}

		end = seg->offset;

		lo->offset = layout_end(seg);

	} else {

		/* retain the whole layout segment on a split. */

		if (layout_end(seg) < end) {

			dprintk("%s: split not supported\n", __func__);

			return;

		}



		lo->offset = layout_end(seg);

		end = seg->offset;

	}



	layout_update_len(lo, end);
@@ -513,6 +512,9 @@ nfsd4_return_client_layouts(struct svc_rqst *rqstp, 


	spin_lock(&clp->cl_lock);

	list_for_each_entry_safe(ls, n, &clp->cl_lo_states, ls_perclnt) {

		if (ls->ls_layout_type != lrp->lr_layout_type)

			continue;



		if (lrp->lr_return_type == RETURN_FSID &&

		    !fh_fsid_match(&ls->ls_stid.sc_file->fi_fhandle,

				   &cstate->current_fh.fh_handle))
@@ -587,6 +589,8 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls) 


	rpc_ntop((struct sockaddr *)&clp->cl_addr, addr_str, sizeof(addr_str));



	trace_layout_recall_fail(&ls->ls_stid.sc_stateid);



	printk(KERN_WARNING

		"nfsd: client %s failed to respond to layout recall. "

		"  Fencing..\n", addr_str);

fs/nfsd/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -1237,8 +1237,8 @@ nfsd4_getdeviceinfo(struct svc_rqst *rqstp, 
		nfserr = ops->proc_getdeviceinfo(exp->ex_path.mnt->mnt_sb, gdp);



	gdp->gd_notify_types &= ops->notify_types;

	exp_put(exp);

out:

	exp_put(exp);

	return nfserr;

}

fs/nfsd/nfs4state.c

+2 −2
Original line number Diff line number Diff line
@@ -3221,7 +3221,7 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open, 
	} else

		nfs4_free_openowner(&oo->oo_owner);

	spin_unlock(&clp->cl_lock);

	return oo;

	return ret;

}



static void init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *open) {
@@ -5062,7 +5062,7 @@ alloc_init_lock_stateowner(unsigned int strhashval, struct nfs4_client *clp, 
	} else

		nfs4_free_lockowner(&lo->lo_owner);

	spin_unlock(&clp->cl_lock);

	return lo;

	return ret;

}



static void