diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 22:56:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 22:56:03 -0700 |
| commit | c2f340a69cabe0fb7b9f02d1a2495927db225a06 (patch) | |
| tree | dd9bc3125f833adf163c47542917ebc18b1acc56 /include/linux | |
| parent | 3ddcd0569cd68f00f3beae9a7959b72918bb91f4 (diff) | |
| parent | cf283ade08c454e884394a4720f22421dd33a715 (diff) | |
| download | linux-3.10-c2f340a69cabe0fb7b9f02d1a2495927db225a06.tar.gz linux-3.10-c2f340a69cabe0fb7b9f02d1a2495927db225a06.tar.bz2 linux-3.10-c2f340a69cabe0fb7b9f02d1a2495927db225a06.zip | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
ore: Make ore its own module
exofs: Rename raid engine from exofs/ios.c => ore
exofs: ios: Move to a per inode components & device-table
exofs: Move exofs specific osd operations out of ios.c
exofs: Add offset/length to exofs_get_io_state
exofs: Fix truncate for the raid-groups case
exofs: Small cleanup of exofs_fill_super
exofs: BUG: Avoid sbi realloc
exofs: Remove pnfs-osd private definitions
nfs_xdr: Move nfs4_string definition out of #ifdef CONFIG_NFS_V4
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nfs_xdr.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 569ea5b76fd..abd615d74a2 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -773,6 +773,11 @@ struct nfs3_getaclres { struct posix_acl * acl_default; }; +struct nfs4_string { + unsigned int len; + char *data; +}; + #ifdef CONFIG_NFS_V4 typedef u64 clientid4; @@ -963,11 +968,6 @@ struct nfs4_server_caps_res { struct nfs4_sequence_res seq_res; }; -struct nfs4_string { - unsigned int len; - char *data; -}; - #define NFS4_PATHNAME_MAXCOMPONENTS 512 struct nfs4_pathname { unsigned int ncomponents; |