Update 2.6.34 sources from stable (v2.6.34.10)

sources/2.6.34/cifsproto.h

@@ -326,10 +326,10 @@ extern int cifsConvertToUCS(__le16 *target, const char *source, int maxlen,
 			const struct nls_table *cp, int mapChars);
 
 extern int CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
-			const __u16 netfid, const __u64 len, const __u64 offset,
-			const __u32 numUnlock, const __u32 numLock,
-			const __u8 lockType, const bool waitFlag,
-			const __u8 oplock_level);
+			const __u16 netfid, const __u64 len,
+			const __u64 offset, const __u32 numUnlock,
+			const __u32 numLock, const __u8 lockType,
+			const bool waitFlag, const __u8 oplock_level);
 extern int CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
 			const __u16 smb_file_id, const int get_flag,
 			const __u64 len, struct file_lock *,

sources/2.6.34/cifssmb.c

@@ -1658,8 +1658,9 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
 
 int
 CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
-	    const __u16 smb_file_id, const __u64 len, const __u64 offset,
-	    const __u32 numUnlock, const __u32 numLock, const __u8 lockType,
+	    const __u16 smb_file_id, const __u64 len,
+	    const __u64 offset, const __u32 numUnlock,
+	    const __u32 numLock, const __u8 lockType,
 	    const bool waitFlag, const __u8 oplock_level)
 {
 	int rc = 0;