From 74f166f4005b46c8f041da1d2deddc83b4f5a7f8 Mon Sep 17 00:00:00 2001 From: Krzysztof Mazur Date: Tue, 21 Dec 2010 23:45:52 +0100 Subject: [PATCH 13/84] lsbd: debug cleanups --- drivers/block/lsbd.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/block/lsbd.c b/drivers/block/lsbd.c index 5933814..abcca2b 100644 --- a/drivers/block/lsbd.c +++ b/drivers/block/lsbd.c @@ -283,8 +283,6 @@ static struct buffer_head *lsbd_get_buffer(struct lsbd *p) init_waitqueue_head(&bh->b_wait); bh->b_rdev = p->dev; atomic_set(&bh->b_count, 1); - - lsbd_debug(p, "allocated buffer %p\n", bh); return bh; } @@ -293,7 +291,6 @@ static void lsbd_put_buffer(struct lsbd *p, struct buffer_head *bh) if (bh) { __free_page(bh->b_page); kmem_cache_free(bh_cachep, bh); - lsbd_debug(p, "free buffer %p\n", bh); } } @@ -339,15 +336,10 @@ struct buffer_head *lsbd_sread(struct lsbd *p, int block, unsigned int sector) { struct buffer_head *bh; - lsbd_debug(p, "sector %d.%d: getblk\n", block, sector); bh = lsbd_getblk(p, block, sector); - if (buffer_uptodate(bh)) { - lsbd_debug(p, "sector %d.%d: already uptodate\n", - block, sector); + if (buffer_uptodate(bh)) return bh; - } set_bit(BH_Sync, &bh->b_state); - lsbd_debug(p, "sector %d.%d: read\n", block, sector); lock_buffer(bh); bh->b_end_io = lsbd_end_buffer_io_sync; @@ -356,13 +348,9 @@ struct buffer_head *lsbd_sread(struct lsbd *p, int block, unsigned int sector) get_bh(bh); generic_make_request(READ, bh); - lsbd_debug(p, "sector %d.%d: wait...\n", block, sector); wait_on_buffer(bh); - if (buffer_uptodate(bh)) { - lsbd_debug(p, "sector %d.%d: ok\n", block, sector); + if (buffer_uptodate(bh)) return bh; - } - lsbd_debug(p, "sector %d.%d: I/O error\n", block, sector); brelse(bh); lsbd_put_buffer(p, bh); return NULL; @@ -1503,8 +1491,6 @@ static int lsbd_write_block(struct lsbd *p) lsbd_block_commit(p, b); for (i = 0; i < p->sectors_per_block; i++) { mark_buffer_uptodate(bh[i], 1); -// unlock_buffer(bh[i]); -// mark_buffer_dirty(bh[i]); bh[i]->b_end_io = lsbd_end_buffer_io_sync; set_bit(BH_Req, &bh[i]->b_state); set_bit(BH_Launder, &bh[i]->b_state); -- 1.8.4.652.g0d6e0ce