UBUNTU: ubuntu: dm-raid-45 -- update to compile with 2.6.32

This commit changed bio_barrier() to direct flag accessors,
convert dm-raid-4-5 to match:

  commit 1f98a13f623e0ef666690a18c1250335fc6d7ef1
  Author: Jens Axboe <jens.axboe@oracle.com>
  Date:   Fri Sep 11 14:32:04 2009 +0200

    bio: first step in sanitizing the bio->bi_rw flag testing

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/ubuntu/dm-raid4-5/dm-raid4-5.c b/ubuntu/dm-raid4-5/dm-raid4-5.c
index 52b21e9..4efe1fc 100644 (file)
--- a/ubuntu/dm-raid4-5/dm-raid4-5.c
+++ b/ubuntu/dm-raid4-5/dm-raid4-5.c
@@ -3227,7 +3227,7 @@ static void do_ios(struct raid_set *rs, struct bio_list *ios)
                 * the input queue unless all work queues are empty
                 * and the stripe cache is inactive.
                 */
-               if (unlikely(bio_barrier(bio))) {
+               if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER))) {
                        /* REMOVEME: statistics. */
                        atomic_inc(rs->stats + S_BARRIER);
                        if (delay ||