Commit 9b332cec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd fix from Chuck Lever:

 - Fix a crasher reported by rtm@csail.mit.edu

* tag 'nfsd-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  NFSD: Define a proc_layoutcommit for the FlexFiles layout type
parents 5bd0116d 4b47a860

fs/nfsd/flexfilelayout.c

+8 −0
Original line number Diff line number Diff line
@@ -125,6 +125,13 @@ nfsd4_ff_proc_getdeviceinfo(struct super_block *sb, struct svc_rqst *rqstp, 
	return 0;

}



static __be32

nfsd4_ff_proc_layoutcommit(struct inode *inode, struct svc_rqst *rqstp,

		struct nfsd4_layoutcommit *lcp)

{

	return nfs_ok;

}



const struct nfsd4_layout_ops ff_layout_ops = {

	.notify_types		=

			NOTIFY_DEVICEID4_DELETE | NOTIFY_DEVICEID4_CHANGE,
@@ -133,4 +140,5 @@ const struct nfsd4_layout_ops ff_layout_ops = { 
	.encode_getdeviceinfo	= nfsd4_ff_encode_getdeviceinfo,

	.proc_layoutget		= nfsd4_ff_proc_layoutget,

	.encode_layoutget	= nfsd4_ff_encode_layoutget,

	.proc_layoutcommit	= nfsd4_ff_proc_layoutcommit,

};