summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-06 10:04:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-06 10:04:39 -0700
commit1b7fa4c27111757789b21bb78543317dad4cfd08 (patch)
treea160c42485acf01ade88bee0d7f1d775a4eb3002 /include
parent064ea1ae80749f5548a5613e8c7772fbef34c857 (diff)
parent2dfd06036ba7ae8e7be2daf5a2fff1dac42390bf (diff)
downloadlinux-3.10-1b7fa4c27111757789b21bb78543317dad4cfd08.tar.gz
linux-3.10-1b7fa4c27111757789b21bb78543317dad4cfd08.tar.bz2
linux-3.10-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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 2314ad8b3c9..b1a520ec8b5 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