diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2016-07-14 06:01:17 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2016-07-15 21:31:30 +0200 |
| commit | dd51db188600c8c54c46cff84e83358ece8ccb4d (patch) | |
| tree | 6e4eb879ef909cca0aa2f7507a0592869dcde631 /fs/nfsd | |
| parent | xfs: abstract block export operations from nfsd layouts (diff) | |
| download | linux-dd51db188600c8c54c46cff84e83358ece8ccb4d.tar.xz linux-dd51db188600c8c54c46cff84e83358ece8ccb4d.zip | |
nfsd/blocklayout: Make sure calculate signature/designator length aligned
These values are all multiples of 4 already, so there's no change in
behavior from this patch. But perhaps this will prevent mistakes in the
future.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/blocklayoutxdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/blocklayoutxdr.c b/fs/nfsd/blocklayoutxdr.c index 6c3b316f932e..d72467e5eb6e 100644 --- a/fs/nfsd/blocklayoutxdr.c +++ b/fs/nfsd/blocklayoutxdr.c @@ -43,7 +43,7 @@ nfsd4_block_encode_volume(struct xdr_stream *xdr, struct pnfs_block_volume *b) switch (b->type) { case PNFS_BLOCK_VOLUME_SIMPLE: - len = 4 + 4 + 8 + 4 + b->simple.sig_len; + len = 4 + 4 + 8 + 4 + (XDR_QUADLEN(b->simple.sig_len) << 2); p = xdr_reserve_space(xdr, len); if (!p) return -ETOOSMALL; @@ -54,7 +54,7 @@ nfsd4_block_encode_volume(struct xdr_stream *xdr, struct pnfs_block_volume *b) p = xdr_encode_opaque(p, b->simple.sig, b->simple.sig_len); break; case PNFS_BLOCK_VOLUME_SCSI: - len = 4 + 4 + 4 + 4 + b->scsi.designator_len + 8; + len = 4 + 4 + 4 + 4 + (XDR_QUADLEN(b->scsi.designator_len) << 2) + 8; p = xdr_reserve_space(xdr, len); if (!p) return -ETOOSMALL; |