Skip to content

Commit 9b332ce

Browse files
committed
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 [email protected] * 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
2 parents 5bd0116 + 4b47a86 commit 9b332ce

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

fs/nfsd/flexfilelayout.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,13 @@ nfsd4_ff_proc_getdeviceinfo(struct super_block *sb, struct svc_rqst *rqstp,
125125
return 0;
126126
}
127127

128+
static __be32
129+
nfsd4_ff_proc_layoutcommit(struct inode *inode, struct svc_rqst *rqstp,
130+
struct nfsd4_layoutcommit *lcp)
131+
{
132+
return nfs_ok;
133+
}
134+
128135
const struct nfsd4_layout_ops ff_layout_ops = {
129136
.notify_types =
130137
NOTIFY_DEVICEID4_DELETE | NOTIFY_DEVICEID4_CHANGE,
@@ -133,4 +140,5 @@ const struct nfsd4_layout_ops ff_layout_ops = {
133140
.encode_getdeviceinfo = nfsd4_ff_encode_getdeviceinfo,
134141
.proc_layoutget = nfsd4_ff_proc_layoutget,
135142
.encode_layoutget = nfsd4_ff_encode_layoutget,
143+
.proc_layoutcommit = nfsd4_ff_proc_layoutcommit,
136144
};

0 commit comments

Comments
 (0)