diff options
| author | Junxiao Bi <junxiao.bi@oracle.com> | 2012-06-27 13:09:54 +0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2012-07-05 12:33:59 +0400 |
| commit | 2dfd06036ba7ae8e7be2daf5a2fff1dac42390bf (patch) | |
| tree | 5f3e2cb5b2c07dcf835e45629733b353fe67d8d6 /include | |
| parent | a4564ead763a9264edbec6d4e72aa273f05eb39c (diff) | |
| download | linux-2dfd06036ba7ae8e7be2daf5a2fff1dac42390bf.tar.xz | |
aio: make kiocb->private NUll in init_sync_kiocb()
Ocfs2 uses kiocb.*private as a flag of unsigned long size. In
commit a11f7e6 ocfs2: serialize unaligned aio, the unaligned
io flag is involved in it to serialize the unaligned aio. As
*private is not initialized in init_sync_kiocb() of do_sync_write(),
this unaligned io flag may be unexpectly set in an aligned dio.
And this will cause OCFS2_I(inode)->ip_unaligned_aio decreased
to -1 in ocfs2_dio_end_io(), thus the following unaligned dio
will hang forever at ocfs2_aiodio_wait() in ocfs2_file_aio_write().
Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Cc: stable@vger.kernel.org
Acked-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/aio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h index 2314ad8b3c9c..b1a520ec8b59 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h @@ -140,6 +140,7 @@ struct kiocb { (x)->ki_dtor = NULL; \ (x)->ki_obj.tsk = tsk; \ (x)->ki_user_data = 0; \ + (x)->private = NULL; \ } while (0) #define AIO_RING_MAGIC 0xa10a10a1 |