forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/fs/cifs/file.c
....@@ -3539,7 +3539,7 @@
35393539 		rdata->got_bytes += result;
35403540 	}
35413541 
3542
-	return rdata->got_bytes > 0 && result != -ECONNABORTED ?
3542
+	return result != -ECONNABORTED && rdata->got_bytes > 0 ?
35433543 						rdata->got_bytes : result;
35443544 }
35453545 
....@@ -4302,7 +4302,7 @@
43024302 		rdata->got_bytes += result;
43034303 	}
43044304 
4305
-	return rdata->got_bytes > 0 && result != -ECONNABORTED ?
4305
+	return result != -ECONNABORTED && rdata->got_bytes > 0 ?
43064306 						rdata->got_bytes : result;
43074307 }
43084308 
....@@ -4580,9 +4580,9 @@
45804580 
45814581 io_error:
45824582 	kunmap(page);
4583
-	unlock_page(page);
45844583 
45854584 read_complete:
4585
+	unlock_page(page);
45864586 	return rc;
45874587 }
45884588