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

Merge tag 'nfsd-4.14-1' of git://linux-nfs.org/~bfields/linux 

Pull nfsd fix from Bruce Fields:
 "One fix for a 4.14 regression, and one minor fix to the MAINTAINERs
  file. (I was weirdly flattered by the idea that lots of random people
  suddenly seemed to think Jeff and I were VFS experts. Turns out it was
  just a typo)"

* tag 'nfsd-4.14-1' of git://linux-nfs.org/~bfields/linux:
  nfsd4: define nfsd4_secinfo_no_name_release()
  MAINTAINERS: associate linux/fs.h with VFS instead of file locking
parents 7056964a ec572b9e

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5346,9 +5346,7 @@ M: "J. Bruce Fields" <bfields@fieldses.org> 
L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	include/linux/fcntl.h

F:	include/linux/fs.h

F:	include/uapi/linux/fcntl.h

F:	include/uapi/linux/fs.h

F:	fs/fcntl.c

F:	fs/locks.c
@@ -5357,6 +5355,8 @@ M: Alexander Viro <viro@zeniv.linux.org.uk> 
L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	fs/*

F:	include/linux/fs.h

F:	include/uapi/linux/fs.h



FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER

M:	Riku Voipio <riku.voipio@iki.fi>

fs/nfsd/nfs4proc.c

+8 −1
Original line number Diff line number Diff line
@@ -927,6 +927,13 @@ nfsd4_secinfo_release(union nfsd4_op_u *u) 
		exp_put(u->secinfo.si_exp);

}



static void

nfsd4_secinfo_no_name_release(union nfsd4_op_u *u)

{

	if (u->secinfo_no_name.sin_exp)

		exp_put(u->secinfo_no_name.sin_exp);

}



static __be32

nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	      union nfsd4_op_u *u)
@@ -2375,7 +2382,7 @@ static const struct nfsd4_operation nfsd4_ops[] = { 
	},

	[OP_SECINFO_NO_NAME] = {

		.op_func = nfsd4_secinfo_no_name,

		.op_release = nfsd4_secinfo_release,

		.op_release = nfsd4_secinfo_no_name_release,

		.op_flags = OP_HANDLES_WRONGSEC,

		.op_name = "OP_SECINFO_NO_NAME",

		.op_rsize_bop = nfsd4_secinfo_rsize,

CRA Git | Maintained and supported by SUSTech CRA and CCSE