From: Junxiao Bi <junxiao.bi@oracle.com>
Date: Wed, 27 Jun 2012 09:09:55 +0000 (+0800)
Subject: ocfs2: clear unaligned io flag when dio fails
X-Git-Tag: v3.5~86^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e5d3c35a68c9a933bdbdd8685bd1a205b57e806;p=platform%2Fkernel%2Flinux-amlogic.git

ocfs2: clear unaligned io flag when dio fails

The unaligned io flag is set in the kiocb when an unaligned
dio is issued, it should be cleared even when the dio fails,
or it may affect the following io which are using the same
kiocb.

Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: Joel Becker <jlbec@evilplan.org>
---

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 061591a..98513c8 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2422,8 +2422,10 @@ out_dio:
 		unaligned_dio = 0;
 	}
 
-	if (unaligned_dio)
+	if (unaligned_dio) {
+		ocfs2_iocb_clear_unaligned_aio(iocb);
 		atomic_dec(&OCFS2_I(inode)->ip_unaligned_aio);
+	}
 
 out:
 	if (rw_level != -1)