| From 46aca5fdb078081d41e0323f25ac12e7cbfc17bc Mon Sep 17 00:00:00 2001 |
| From: Andy Adamson <andros@netapp.com> |
| Date: Mon, 11 Jul 2011 17:17:42 -0400 |
| Subject: [PATCH] NFSv4.1: update nfs4_fattr_bitmap_maxsz |
| |
| commit e5012d1f3861d18c7f3814e757c1c3ab3741dbcd upstream. |
| |
| Attribute IDs assigned in RFC 5661 now require three bitmaps. |
| Fixes hitting a BUG_ON in xdr_shrink_bufhead when getting ACLs. |
| |
| Signed-off-by: Andy Adamson <andros@netapp.com> |
| Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| fs/nfs/nfs4xdr.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c |
| index 63ec2b7..c1a2f66 100644 |
| --- a/fs/nfs/nfs4xdr.c |
| +++ b/fs/nfs/nfs4xdr.c |
| @@ -89,7 +89,7 @@ static int nfs4_stat_to_errno(int); |
| #define encode_getfh_maxsz (op_encode_hdr_maxsz) |
| #define decode_getfh_maxsz (op_decode_hdr_maxsz + 1 + \ |
| ((3+NFS4_FHSIZE) >> 2)) |
| -#define nfs4_fattr_bitmap_maxsz 3 |
| +#define nfs4_fattr_bitmap_maxsz 4 |
| #define encode_getattr_maxsz (op_encode_hdr_maxsz + nfs4_fattr_bitmap_maxsz) |
| #define nfs4_name_maxsz (1 + ((3 + NFS4_MAXNAMLEN) >> 2)) |
| #define nfs4_path_maxsz (1 + ((3 + NFS4_MAXPATHLEN) >> 2)) |
| -- |
| 1.7.9.6 |
| |
