Merge branch 'fixes-2.6.39' into for-2.6.40

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 134716e5e35..b528f6d4b86 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -550,6 +550,7 @@ enum {
         NFSPROC4_CLNT_SETACL,
         NFSPROC4_CLNT_FS_LOCATIONS,
         NFSPROC4_CLNT_RELEASE_LOCKOWNER,
+        NFSPROC4_CLNT_SECINFO,
 
         /* nfs41 */
         NFSPROC4_CLNT_EXCHANGE_ID,
@@ -560,6 +561,7 @@ enum {
         NFSPROC4_CLNT_RECLAIM_COMPLETE,
         NFSPROC4_CLNT_LAYOUTGET,
         NFSPROC4_CLNT_GETDEVICEINFO,
+        NFSPROC4_CLNT_LAYOUTCOMMIT,
 };
 
 /* nfs41 types */