aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-09 21:12:07 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-09 21:12:07 -0500
commitf94aa7c7f1fc474be776e4bf88088d5a007d3575 (patch)
treeba607798fb9e9136d267353b9b5c1b4dd50f4819 /fs/cifs
parent9c1db7798141e2658e4b5bb170128dfdc3270ff4 (diff)
parentc9efe51165fa0aff57be54e3cb0201ac87f68980 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro: "A couple of fixes, both -stable fodder. The O_SYNC bug is fairly old..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fix a kmap leak in virtio_console fix O_SYNC|O_APPEND syncing the wrong range on write()
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 853d6d1cc822..a7eda8ebfacc 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2559,8 +2559,8 @@ cifs_writev(struct kiocb *iocb, const struct iovec *iov,
2559 if (rc > 0) { 2559 if (rc > 0) {
2560 ssize_t err; 2560 ssize_t err;
2561 2561
2562 err = generic_write_sync(file, pos, rc); 2562 err = generic_write_sync(file, iocb->ki_pos - rc, rc);
2563 if (err < 0 && rc > 0) 2563 if (err < 0)
2564 rc = err; 2564 rc = err;
2565 } 2565 }
2566 2566