Commit 2c52c837 authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Anna Schumaker
Browse files

NFSv4 only print the label when its queried 



When the bitmask of the attributes doesn't include the security label,
don't bother printing it. Since the label might not be null terminated,
adjust the printing format accordingly.

Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent c4f03966

fs/nfs/nfs4xdr.c

+4 −3
Original line number Diff line number Diff line
@@ -4200,10 +4200,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, 
		} else

			printk(KERN_WARNING "%s: label too long (%u)!\n",

					__func__, len);

	}

		if (label && label->label)

		dprintk("%s: label=%s, len=%d, PI=%d, LFS=%d\n", __func__,

			(char *)label->label, label->len, label->pi, label->lfs);

			dprintk("%s: label=%.*s, len=%d, PI=%d, LFS=%d\n",

				__func__, label->len, (char *)label->label,

				label->len, label->pi, label->lfs);

	}

	return status;

}