Indent.

diff --git a/kernel/common/dm-mirror.c b/kernel/common/dm-mirror.c
index 25eb49dbb0820853bc63501648060c83ea984067..f031816ab10dfbc2b0cdb469d8a5a10cd73dbcbd 100644 (file)
--- a/kernel/common/dm-mirror.c
+++ b/kernel/common/dm-mirror.c
@@ -40,12 +40,11 @@ static void mirror_end_io(struct buffer_head *bh, int uptodate)
        if (!uptodate) {
                DMERR("Mirror copy to %s failed", kdevname(lc->todev->dev));
                lc->error = 1;
-               dm_notify(lc); /* TODO: interface ?? */
+               dm_notify(lc);  /* TODO: interface ?? */
        }
        kfree(bh);
 }
 
-
 /* Called when the copy I/O has finished */
 static void copy_callback(copy_cb_reason_t reason, void *context, long arg)
 {
@@ -56,16 +55,18 @@ static void copy_callback(copy_cb_reason_t reason, void *context, long arg)
                return;
        }
 
-       if (reason == COPY_CB_FAILED_READ ||
-           reason == COPY_CB_FAILED_WRITE) {
-               DMERR("Mirror block %s on %s failed, sector %ld", reason==COPY_CB_FAILED_READ?"read":"write",
-                     reason==COPY_CB_FAILED_READ?kdevname(lc->fromdev->dev):kdevname(lc->todev->dev), arg);
+       if (reason == COPY_CB_FAILED_READ || reason == COPY_CB_FAILED_WRITE) {
+               DMERR("Mirror block %s on %s failed, sector %ld",
+                     reason == COPY_CB_FAILED_READ ? "read" : "write",
+                     reason == COPY_CB_FAILED_READ ?
+                     kdevname(lc->fromdev->dev) :
+                     kdevname(lc->todev->dev), arg);
                lc->error = 1;
        }
 
        if (reason == COPY_CB_COMPLETE) {
                /* Say we've finished */
-               dm_notify(lc); /* TODO: interface ?? */
+               dm_notify(lc);  /* TODO: interface ?? */
        }
 }
 
@@ -134,7 +135,7 @@ static int mirror_ctr(struct dm_table *t, offset_t b, offset_t l,
        lc->to_delta = (int) offset2 - (int) b;
        lc->frompos = offset1;
        lc->topos = offset2;
-       lc->error  = 0;
+       lc->error = 0;
        init_rwsem(&lc->lock);
        *context = lc;
 
@@ -150,10 +151,10 @@ static int mirror_ctr(struct dm_table *t, offset_t b, offset_t l,
        }
        return 0;
 
- bad_put:
+      bad_put:
        dm_table_put_device(t, lc->fromdev);
        dm_table_put_device(t, lc->todev);
- bad:
+      bad:
        kfree(lc);
        return -EINVAL;
 }
@@ -176,22 +177,26 @@ static int mirror_map(struct buffer_head *bh, int rw, void *context)
        bh->b_rdev = lc->fromdev->dev;
        bh->b_rsector = bh->b_rsector + lc->from_delta;
 
-       /* If we've already copied this block then duplicated it to the mirror device */
+       /* 
+        * If we've already copied this block then duplicated 
+        * it to the mirror device 
+        */
        if (rw == WRITE && bh->b_rsector < lc->got_to) {
 
                /* Schedule copy of I/O to other target */
                /* TODO: kmalloc is naff here */
-               struct buffer_head *dbh = kmalloc(sizeof(struct buffer_head), GFP_NOIO);
+               struct buffer_head *dbh = kmalloc(sizeof(struct buffer_head),
+                                                 GFP_NOIO);
                if (dbh) {
                        *dbh = *bh;
-                       dbh->b_rdev    = lc->todev->dev;
-                       dbh->b_rsector = bh->b_rsector - lc->from_delta + lc->to_delta;
-                       dbh->b_end_io  = mirror_end_io;
+                       dbh->b_rdev = lc->todev->dev;
+                       dbh->b_rsector = bh->b_rsector - lc->from_delta
+                           + lc->to_delta;
+                       dbh->b_end_io = mirror_end_io;
                        dbh->b_private = lc;
 
                        generic_make_request(WRITE, dbh);
-               }
-               else {
+               } else {
                        DMERR("kmalloc failed for mirror bh");
                        lc->error = 1;
                }

diff --git a/kernel/common/dm-origin.c b/kernel/common/dm-origin.c
index 11040fe9243abc94fdacaacfd0fefe28dad188e4..02c0d0ff1136c22df06d82a99605dd3f062c3723 100644 (file)
--- a/kernel/common/dm-origin.c
+++ b/kernel/common/dm-origin.c
@@ -86,7 +86,7 @@ static int origin_map(struct buffer_head *bh, int rw, void *context)
 
        /* Only tell snapshots if this is a write */
        if (rw != READ && rw != READA) {
-               return dm_do_snapshot(lc->target_dev, bh);
+               return dm_do_snapshot(lc->target_dev, bh);
        }
 
        return 1;