diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-03 15:04:15 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-03 15:05:56 -0500 |
commit | 8aa0a410af8011d557877e558f9ff17c082c6840 (patch) | |
tree | e347920bcaba78f6af0fecc626c1842f85aeeb83 /include/linux/nfs_xdr.h | |
parent | 54b50af089552bae368502e35dead67e81129b8d (diff) | |
parent | abe9a6d57b4544ac208401f9c0a4262814db2be4 (diff) |
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.h | 2 |
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 { | |||
614 | size_t acl_len; | 614 | size_t acl_len; |
615 | unsigned int acl_pgbase; | 615 | unsigned int acl_pgbase; |
616 | struct page ** acl_pages; | 616 | struct page ** acl_pages; |
617 | struct page * acl_scratch; | ||
618 | struct nfs4_sequence_args seq_args; | 617 | struct nfs4_sequence_args seq_args; |
619 | }; | 618 | }; |
620 | 619 | ||
@@ -624,6 +623,7 @@ struct nfs_getaclres { | |||
624 | size_t acl_len; | 623 | size_t acl_len; |
625 | size_t acl_data_offset; | 624 | size_t acl_data_offset; |
626 | int acl_flags; | 625 | int acl_flags; |
626 | struct page * acl_scratch; | ||
627 | struct nfs4_sequence_res seq_res; | 627 | struct nfs4_sequence_res seq_res; |
628 | }; | 628 | }; |
629 | 629 | ||