diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-06 10:04:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-06 10:04:39 -0700 |
| commit | 1b7fa4c27111757789b21bb78543317dad4cfd08 (patch) | |
| tree | a160c42485acf01ade88bee0d7f1d775a4eb3002 /fs/ocfs2/file.c | |
| parent | 064ea1ae80749f5548a5613e8c7772fbef34c857 (diff) | |
| parent | 2dfd06036ba7ae8e7be2daf5a2fff1dac42390bf (diff) | |
| download | op-kernel-dev-1b7fa4c27111757789b21bb78543317dad4cfd08.zip op-kernel-dev-1b7fa4c27111757789b21bb78543317dad4cfd08.tar.gz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
Pull ocfs2 fixes from Joel Becker.
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
aio: make kiocb->private NUll in init_sync_kiocb()
ocfs2: Fix bogus error message from ocfs2_global_read_info
ocfs2: for SEEK_DATA/SEEK_HOLE, return internal error unchanged if ocfs2_get_clusters_nocache() or ocfs2_inode_lock() call failed.
ocfs2: use spinlock irqsave for downconvert lock.patch
ocfs2: Misplaced parens in unlikley
ocfs2: clear unaligned io flag when dio fails
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 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) |
