Since commit 18290650b1c8 ("NFS: Move buffered I/O locking into
nfs_file_write()") nfs_file_write() has not flushed the correct byte
range during synchronous writes. generic_write_sync() expects that
iocb->ki_pos points to the right edge of the range rather than the
left edge.
To replicate the problem, open a file with O_DSYNC, have the client
write at increasing offsets, and then print the successful offsets.
Block port 2049 partway through that sequence, and observe that the
client application indicates successful writes in advance of what the
server received.
Fixes: 18290650b1c8 ("NFS: Move buffered I/O locking into nfs_file_write()")
Signed-off-by: Jacob Strauss <[email protected]>
Signed-off-by: Tarang Gupta <[email protected]>
Tested-by: Tarang Gupta <[email protected]>
---
fs/nfs/file.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index af330c31f627..a85d1cf9b4a8 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -631,11 +631,11 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
if (result <= 0)
goto out;
- result = generic_write_sync(iocb, result);
- if (result < 0)
- goto out;
written = result;
iocb->ki_pos += written;
+ result = generic_write_sync(iocb, written);
+ if (result < 0)
+ goto out;
/* Return error values */
if (nfs_need_check_write(file, inode)) {
--
2.11.0 (Apple Git-81)
T24gVGh1LCAyMDE3LTA5LTA3IGF0IDA5OjI5IC0wNDAwLCB0YXJhbmdnQGFtYXpvbi5jb20gd3Jv
dGU6DQo+IFNpbmNlIGNvbW1pdCAxODI5MDY1MGIxYzggKCJORlM6IE1vdmUgYnVmZmVyZWQgSS9P
IGxvY2tpbmcgaW50bw0KPiBuZnNfZmlsZV93cml0ZSgpIikgbmZzX2ZpbGVfd3JpdGUoKSBoYXMg
bm90IGZsdXNoZWQgdGhlIGNvcnJlY3QgYnl0ZQ0KPiByYW5nZSBkdXJpbmcgc3luY2hyb25vdXMg
d3JpdGVzLiAgZ2VuZXJpY193cml0ZV9zeW5jKCkgZXhwZWN0cyB0aGF0DQo+IGlvY2ItPmtpX3Bv
cyBwb2ludHMgdG8gdGhlIHJpZ2h0IGVkZ2Ugb2YgdGhlIHJhbmdlIHJhdGhlciB0aGFuIHRoZQ0K
PiBsZWZ0IGVkZ2UuDQo+IA0KPiBUbyByZXBsaWNhdGUgdGhlIHByb2JsZW0sIG9wZW4gYSBmaWxl
IHdpdGggT19EU1lOQywgaGF2ZSB0aGUgY2xpZW50DQo+IHdyaXRlIGF0IGluY3JlYXNpbmcgb2Zm
c2V0cywgYW5kIHRoZW4gcHJpbnQgdGhlIHN1Y2Nlc3NmdWwgb2Zmc2V0cy4NCj4gQmxvY2sgcG9y
dCAyMDQ5IHBhcnR3YXkgdGhyb3VnaCB0aGF0IHNlcXVlbmNlLCBhbmQgb2JzZXJ2ZSB0aGF0IHRo
ZQ0KPiBjbGllbnQgYXBwbGljYXRpb24gaW5kaWNhdGVzIHN1Y2Nlc3NmdWwgd3JpdGVzIGluIGFk
dmFuY2Ugb2Ygd2hhdCB0aGUNCj4gc2VydmVyIHJlY2VpdmVkLg0KPiANCj4gRml4ZXM6IDE4Mjkw
NjUwYjFjOCAoIk5GUzogTW92ZSBidWZmZXJlZCBJL08gbG9ja2luZyBpbnRvDQo+IG5mc19maWxl
X3dyaXRlKCkiKQ0KPiBTaWduZWQtb2ZmLWJ5OiBKYWNvYiBTdHJhdXNzIDxqc3N0cmF1c0BhbWF6
b24uY29tPg0KPiBTaWduZWQtb2ZmLWJ5OiBUYXJhbmcgR3VwdGEgPHRhcmFuZ2dAYW1hem9uLmNv
bT4NCj4gVGVzdGVkLWJ5OiBUYXJhbmcgR3VwdGEgPHRhcmFuZ2dAYW1hem9uLmNvbT4NCg0KVGhh
bmtzISBOaWNlIGNhdGNoIQ0KDQpQYXRjaCBpcyBhcHBsaWVkIGFuZCB3aWxsIGJlIHF1ZXVlZCBm
b3Igc3RhYmxlIDQuOCsuLi4NCg0KLS0gDQpUcm9uZCBNeWtsZWJ1c3QNCkxpbnV4IE5GUyBjbGll
bnQgbWFpbnRhaW5lciwgUHJpbWFyeURhdGENCnRyb25kLm15a2xlYnVzdEBwcmltYXJ5ZGF0YS5j
b20NCg==