diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-06 19:04:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-06 19:04:39 +0200 |
| commit | 1b7fa4c27111757789b21bb78543317dad4cfd08 (patch) | |
| tree | a160c42485acf01ade88bee0d7f1d775a4eb3002 /include | |
| parent | Merge git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | aio: make kiocb->private NUll in init_sync_kiocb() (diff) | |
| download | linux-1b7fa4c27111757789b21bb78543317dad4cfd08.tar.xz linux-1b7fa4c27111757789b21bb78543317dad4cfd08.zip | |
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 '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 |