diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 19:16:43 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 19:16:43 +1000 |
| commit | 50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6 (patch) | |
| tree | c76f080377dd611857fa33f38a2b8a2af4576f8b /fs/ocfs2/file.c | |
| parent | a8b91e43afd736fcebb0836359e5ddaeae45b2ab (diff) | |
| parent | 50fb31cfed9218b439360caf7c0399b00042da15 (diff) | |
| download | blackbird-op-linux-50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6.tar.gz blackbird-op-linux-50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6.zip | |
Merge branch 'merge' into next
We want to bring in the latest IRQ fixes
Diffstat (limited to 'fs/ocfs2/file.c')
| -rw-r--r-- | fs/ocfs2/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 061591a3ab08..98513c8ed589 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) |
