Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / drivers / md / md.h

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 2a514036a83dc0da07c0966b7fe247c18356bbbf..b8859cbf84b618b39ed3d92a2887e8764c403919 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -673,8 +673,6 @@ extern void md_rdev_clear(struct md_rdev *rdev);
 
 extern void mddev_suspend(struct mddev *mddev);
 extern void mddev_resume(struct mddev *mddev);
-extern struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask,
-                                  struct mddev *mddev);
 extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,
                                   struct mddev *mddev);
 
@@ -710,4 +708,11 @@ static inline void mddev_clear_unsupported_flags(struct mddev *mddev,
 {
        mddev->flags &= ~unsupported_flags;
 }
+
+static inline void mddev_check_writesame(struct mddev *mddev, struct bio *bio)
+{
+       if (bio_op(bio) == REQ_OP_WRITE_SAME &&
+           !bdev_get_queue(bio->bi_bdev)->limits.max_write_same_sectors)
+               mddev->queue->limits.max_write_same_sectors = 0;
+}
 #endif /* _MD_MD_H */