Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · a4be6c77b5 - Gogs: Go Git Service GfA electronic

Explorar o código

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fix from Steve French.

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix return value in cifsConvertToUTF16

Linus Torvalds %!s(int64=13) %!d(string=hai) anos

pai

abef3bd710 c73f693989

achega

a4be6c77b5

Modificáronse 1 ficheiros con 1 adicións e 1 borrados

Dividir vista Mostrar estatísticas de Diff

						
							+ 1
							
							- 1
						
fs/cifs/cifs_unicode.c
							 
								Ver ficheiro
							
				@@ -328,7 +328,7 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen,
			
				 	}
			
				 ctoUTF16_out:
			
				-	return i;
			
				+	return j;
			
				 }
			
				 #ifdef CONFIG_CIFS_SMB2