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

Commit 5cd09eea authored by Frank Sorenson's avatar Frank Sorenson Committed by Greg Kroah-Hartman
Browse files

NFS: Correct size calculation for create reply length 



[ Upstream commit ad3dbe35c833c2d4d0bbf3f04c785d32f931e7c9 ]

CREATE requests return a post_op_fh3, rather than nfs_fh3. The
post_op_fh3 includes an extra word to indicate 'handle_follows'.

Without that additional word, create fails when full 64-byte
filehandles are in use.

Add NFS3_post_op_fh_sz, and correct the size calculation for
NFS3_createres_sz.

Signed-off-by: default avatarFrank Sorenson <sorenson@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 208142a8

fs/nfs/nfs3xdr.c

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
 */

#define NFS3_fhandle_sz		(1+16)

#define NFS3_fh_sz		(NFS3_fhandle_sz)	/* shorthand */

#define NFS3_post_op_fh_sz	(1+NFS3_fh_sz)

#define NFS3_sattr_sz		(15)

#define NFS3_filename_sz	(1+(NFS3_MAXNAMLEN>>2))

#define NFS3_path_sz		(1+(NFS3_MAXPATHLEN>>2))
@@ -71,7 +72,7 @@ 
#define NFS3_readlinkres_sz	(1+NFS3_post_op_attr_sz+1)

#define NFS3_readres_sz		(1+NFS3_post_op_attr_sz+3)

#define NFS3_writeres_sz	(1+NFS3_wcc_data_sz+4)

#define NFS3_createres_sz	(1+NFS3_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)

#define NFS3_createres_sz	(1+NFS3_post_op_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)

#define NFS3_renameres_sz	(1+(2 * NFS3_wcc_data_sz))

#define NFS3_linkres_sz		(1+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)

#define NFS3_readdirres_sz	(1+NFS3_post_op_attr_sz+2)