Merge branch 'nfs-for-2.6.39' into nfs-for-next

2011-03-24 17:03:14 -04:00
parent 8f70e95f9f 35124a0994
commit 0acd220192
21 changed files with 1245 additions and 201 deletions
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@ -561,6 +561,7 @@ enum {
 	NFSPROC4_CLNT_RECLAIM_COMPLETE,
 	NFSPROC4_CLNT_LAYOUTGET,
 	NFSPROC4_CLNT_GETDEVICEINFO,
+	NFSPROC4_CLNT_LAYOUTCOMMIT,
 };

 /* nfs41 types */