Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 91fa9a94ae92..d77797a52b7b 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -36,6 +36,7 @@ enum bh_state_bits {
         BH_Quiet,       /* Buffer Error Prinks to be quiet */
         BH_Meta,        /* Buffer contains metadata */
         BH_Prio,        /* Buffer should be submitted with REQ_PRIO */
+        BH_Defer_Completion, /* Defer AIO completion to workqueue */
 
         BH_PrivateStart,/* not a state bit, but the first bit available
                          * for private allocation by other entities
@@ -128,6 +129,7 @@ BUFFER_FNS(Write_EIO, write_io_error)
 BUFFER_FNS(Unwritten, unwritten)
 BUFFER_FNS(Meta, meta)
 BUFFER_FNS(Prio, prio)
+BUFFER_FNS(Defer_Completion, defer_completion)
 
 #define bh_offset(bh)           ((unsigned long)(bh)->b_data & ~PAGE_MASK)