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

Commit 45724e8a authored by Kinglong Mee's avatar Kinglong Mee Committed by Trond Myklebust
Browse files

NFS: Fix bad defines of callback response maxsize 



As CB_OP_TAGLEN_MAXSZ, all XXX_MAXSZ should be defined as bit.
Each operation should not cantains CB_OP_TAGLEN_MAXSZ.

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 590184a6

fs/nfs/callback_xdr.c

+10 −8
Original line number Diff line number Diff line
@@ -19,18 +19,20 @@ 
#include "nfs4session.h"



#define CB_OP_TAGLEN_MAXSZ		(512)

#define CB_OP_HDR_RES_MAXSZ	(2 + CB_OP_TAGLEN_MAXSZ)

#define CB_OP_GETATTR_BITMAP_MAXSZ	(4)

#define CB_OP_HDR_RES_MAXSZ		(2 * 4) // opcode, status

#define CB_OP_GETATTR_BITMAP_MAXSZ	(4 * 4) // bitmap length, 3 bitmaps

#define CB_OP_GETATTR_RES_MAXSZ		(CB_OP_HDR_RES_MAXSZ + \

					 CB_OP_GETATTR_BITMAP_MAXSZ + \

				2 + 2 + 3 + 3)

					 /* change, size, ctime, mtime */\

					 (2 + 2 + 3 + 3) * 4)

#define CB_OP_RECALL_RES_MAXSZ		(CB_OP_HDR_RES_MAXSZ)



#if defined(CONFIG_NFS_V4_1)

#define CB_OP_LAYOUTRECALL_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ)

#define CB_OP_DEVICENOTIFY_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ)

#define CB_OP_SEQUENCE_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ + \

					4 + 1 + 3)

					 NFS4_MAX_SESSIONID_LEN + \

					 (1 + 3) * 4) // seqid, 3 slotids

#define CB_OP_RECALLANY_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ)

#define CB_OP_RECALLSLOT_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ)

#endif /* CONFIG_NFS_V4_1 */