diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /include/linux/nfs_xdr.h | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
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 */ |