diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/block/drbd/drbd_main.c | |
parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index dfc85f32d31..5b525c179f3 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -1561,7 +1561,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, | |||
1561 | if (drbd_send_state(mdev)) | 1561 | if (drbd_send_state(mdev)) |
1562 | dev_warn(DEV, "Notified peer that I'm now diskless.\n"); | 1562 | dev_warn(DEV, "Notified peer that I'm now diskless.\n"); |
1563 | /* corresponding get_ldev in __drbd_set_state | 1563 | /* corresponding get_ldev in __drbd_set_state |
1564 | * this may finaly trigger drbd_ldev_destroy. */ | 1564 | * this may finally trigger drbd_ldev_destroy. */ |
1565 | put_ldev(mdev); | 1565 | put_ldev(mdev); |
1566 | } | 1566 | } |
1567 | 1567 | ||
@@ -3706,7 +3706,7 @@ int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev) | |||
3706 | buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page); | 3706 | buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page); |
3707 | 3707 | ||
3708 | if (!drbd_md_sync_page_io(mdev, bdev, bdev->md.md_offset, READ)) { | 3708 | if (!drbd_md_sync_page_io(mdev, bdev, bdev->md.md_offset, READ)) { |
3709 | /* NOTE: cant do normal error processing here as this is | 3709 | /* NOTE: can't do normal error processing here as this is |
3710 | called BEFORE disk is attached */ | 3710 | called BEFORE disk is attached */ |
3711 | dev_err(DEV, "Error while reading metadata.\n"); | 3711 | dev_err(DEV, "Error while reading metadata.\n"); |
3712 | rv = ERR_IO_MD_DISK; | 3712 | rv = ERR_IO_MD_DISK; |