summaryrefslogtreecommitdiff
path: root/include/linux/nfs_xdr.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-04 00:04:15 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-04 00:05:56 +0400
commit8aa0a410af8011d557877e558f9ff17c082c6840 (patch)
treee347920bcaba78f6af0fecc626c1842f85aeeb83 /include/linux/nfs_xdr.h
parent54b50af089552bae368502e35dead67e81129b8d (diff)
parentabe9a6d57b4544ac208401f9c0a4262814db2be4 (diff)
downloadlinux-8aa0a410af8011d557877e558f9ff17c082c6840.tar.xz
Merge commit 'nfs-for-3.3-4' into nfs-for-next
Conflicts: fs/nfs/nfs4proc.c Back-merge of the upstream kernel in order to fix a conflict with the slotid type conversion and implementation id patches...
Diffstat (limited to 'include/linux/nfs_xdr.h')
-rw-r--r--include/linux/nfs_xdr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 6f4c35941965..c1cf86cceee4 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -614,7 +614,6 @@ struct nfs_getaclargs {
size_t acl_len;
unsigned int acl_pgbase;
struct page ** acl_pages;
- struct page * acl_scratch;
struct nfs4_sequence_args seq_args;
};
@@ -624,6 +623,7 @@ struct nfs_getaclres {
size_t acl_len;
size_t acl_data_offset;
int acl_flags;
+ struct page * acl_scratch;
struct nfs4_sequence_res seq_res;
};