mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

NFSD: Adds macro EX_UUID_LEN for exports uuid's length

Browse source 
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Kinglong Mee 2014-05-23 20:00:19 +08:00 committed by J. Bruce Fields
parent 0d63790c36
commit 94eb36892d
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/nfsd/export.c
View file

@ -487,10 +487,10 @@ uuid_parse(char **mesg, char *buf, unsigned char **puuid)
/* expect a 16 byte uuid encoded as \xXXXX... */ /* expect a 16 byte uuid encoded as \xXXXX... */
len = qword_get(mesg, buf, PAGE_SIZE); len = qword_get(mesg, buf, PAGE_SIZE);
if (len != 16) if (len != EX_UUID_LEN)
return -EINVAL; return -EINVAL;
*puuid = kmemdup(buf, 16, GFP_KERNEL); *puuid = kmemdup(buf, EX_UUID_LEN, GFP_KERNEL);
if (*puuid == NULL) if (*puuid == NULL)
return -ENOMEM; return -ENOMEM;
@ -663,7 +663,7 @@ static int svc_export_show(struct seq_file *m,
if (exp->ex_uuid) { if (exp->ex_uuid) {
int i; int i;
seq_puts(m, ",uuid="); seq_puts(m, ",uuid=");
for (i=0; i<16; i++) { for (i = 0; i < EX_UUID_LEN; i++) {
if ((i&3) == 0 && i) if ((i&3) == 0 && i)
seq_putc(m, ':'); seq_putc(m, ':');
seq_printf(m, "%02x", exp->ex_uuid[i]); seq_printf(m, "%02x", exp->ex_uuid[i]);

1
fs/nfsd/export.h
View file

@ -37,6 +37,7 @@ struct nfsd4_fs_locations {
* spkm3i, and spkm3p (and using all 8 at once should be rare). * spkm3i, and spkm3p (and using all 8 at once should be rare).
*/ */
#define MAX_SECINFO_LIST 8 #define MAX_SECINFO_LIST 8
#define EX_UUID_LEN 16
struct exp_flavor_info { struct exp_flavor_info {
u32 pseudoflavor; u32 pseudoflavor;

3
fs/nfsd/nfs4xdr.c
View file

@ -2223,7 +2223,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
*p++ = cpu_to_be32(MINOR(stat.dev)); *p++ = cpu_to_be32(MINOR(stat.dev));
break; break;
case FSIDSOURCE_UUID: case FSIDSOURCE_UUID:
p = xdr_encode_opaque_fixed(p, exp->ex_uuid, 16); p = xdr_encode_opaque_fixed(p, exp->ex_uuid,
EX_UUID_LEN);
break; break;
} }
} }