Merge tag 'v3.6-rc2' into drm-intel-next

Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put
even more madness on top:

- drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in
  -fixes, that has been changed in a variable-rename in -next, too.

- drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr
  (since all their users have been extracted in another fucntion),
  -fixes added another user for a hw workaroudn.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 22 insertions, 7 deletions

diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 98f34b886f95..38d27a10aa5d 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -66,14 +66,13 @@ typedef int (*dm_request_endio_fn) (struct dm_target *ti,
                                     struct request *clone, int error,
                                     union map_info *map_context);
 
-typedef void (*dm_flush_fn) (struct dm_target *ti);
 typedef void (*dm_presuspend_fn) (struct dm_target *ti);
 typedef void (*dm_postsuspend_fn) (struct dm_target *ti);
 typedef int (*dm_preresume_fn) (struct dm_target *ti);
 typedef void (*dm_resume_fn) (struct dm_target *ti);
 
 typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
-                             char *result, unsigned int maxlen);
+                             unsigned status_flags, char *result, unsigned maxlen);
 
 typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv);
 
@@ -139,7 +138,6 @@ struct target_type {
         dm_map_request_fn map_rq;
         dm_endio_fn end_io;
         dm_request_endio_fn rq_end_io;
-        dm_flush_fn flush;
         dm_presuspend_fn presuspend;
         dm_postsuspend_fn postsuspend;
         dm_preresume_fn preresume;
@@ -188,8 +186,8 @@ struct dm_target {
         sector_t begin;
         sector_t len;
 
-        /* Always a power of 2 */
-        sector_t split_io;
+        /* If non-zero, maximum size of I/O submitted to a target. */
+        uint32_t max_io_len;
 
         /*
          * A number of zero-length barrier requests that will be submitted
@@ -214,15 +212,27 @@ struct dm_target {
         char *error;
 
         /*
+         * Set if this target needs to receive flushes regardless of
+         * whether or not its underlying devices have support.
+         */
+        bool flush_supported:1;
+
+        /*
          * Set if this target needs to receive discards regardless of
          * whether or not its underlying devices have support.
          */
-        unsigned discards_supported:1;
+        bool discards_supported:1;
+
+        /*
+         * Set if the target required discard request to be split
+         * on max_io_len boundary.
+         */
+        bool split_discard_requests:1;
 
         /*
          * Set if this target does not return zeroes on discarded blocks.
          */
-        unsigned discard_zeroes_data_unsupported:1;
+        bool discard_zeroes_data_unsupported:1;
 };
 
 /* Each target can link one of these into the table */
@@ -360,6 +370,11 @@ void dm_table_add_target_callbacks(struct dm_table *t, struct dm_target_callback
 int dm_table_complete(struct dm_table *t);
 
 /*
+ * Target may require that it is never sent I/O larger than len.
+ */
+int __must_check dm_set_target_max_io_len(struct dm_target *ti, sector_t len);
+
+/*
  * Table reference counting.
  */
 struct dm_table *dm_get_live_table(struct mapped_device *md);