diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /include/linux/nfs_xdr.h | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/linux/nfs_xdr.h')
| -rw-r--r-- | include/linux/nfs_xdr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 2d3fb6416d91..db9cbf68e12b 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
| @@ -659,7 +659,7 @@ struct nfs4_rename_res { | |||
| 659 | struct nfs4_setclientid { | 659 | struct nfs4_setclientid { |
| 660 | const nfs4_verifier * sc_verifier; /* request */ | 660 | const nfs4_verifier * sc_verifier; /* request */ |
| 661 | unsigned int sc_name_len; | 661 | unsigned int sc_name_len; |
| 662 | char sc_name[32]; /* request */ | 662 | char sc_name[48]; /* request */ |
| 663 | u32 sc_prog; /* request */ | 663 | u32 sc_prog; /* request */ |
| 664 | unsigned int sc_netid_len; | 664 | unsigned int sc_netid_len; |
| 665 | char sc_netid[4]; /* request */ | 665 | char sc_netid[4]; /* request */ |