lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'nfs-for-3.3-4' into nfs-for-next

Browse Source 
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...
This commit is contained in:
Trond Myklebust
2012-03-03 15:04:15 -05:00
parent 54b50af089 abe9a6d57b
commit 8aa0a410af
106 changed files with 818 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/nfs_xdr.h
View File

@ -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;
};