diff --git a/[refs] b/[refs]
index 11a6570e1fac..d8a191127bfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4819b593740a6d11db07b52e0fe35975b29a185
+refs/heads/master: 1e8a81c5a37907bc082025d3468718116dca1eeb
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 7332194d7afd..b573607b7112 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1851,8 +1851,11 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
 	 * i_sem is held, which protects generic_osync_inode() from
 	 * livelocking.
 	 */
-	if (written >= 0 && file->f_flags & O_SYNC)
-		generic_osync_inode(inode, mapping, OSYNC_METADATA);
+	if (written >= 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
+		int err = generic_osync_inode(inode, mapping, OSYNC_METADATA);
+		if (err < 0)
+			written = err;
+	}
 	if (written == count && !is_sync_kiocb(iocb))
 		written = -EIOCBQUEUED;
 	return written;