Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286933
b: refs/heads/master
c: 0b48514
h: refs/heads/master
i:
  286931: 282559c
v: v3
  • Loading branch information
Stefan Behrens authored and Chris Mason committed Jan 26, 2012
1 parent af9b96c commit 805ea56
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0b4a9d248f88e6773312f262e8185f23863d984a
refs/heads/master: 0b485143d835c019cddc45f46e4b3873dcc9aa4e
11 changes: 6 additions & 5 deletions trunk/fs/btrfs/check-integrity.c
Original file line number Diff line number Diff line change
Expand Up @@ -1662,7 +1662,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
block = btrfsic_block_hashtable_lookup(bdev, dev_bytenr,
&state->block_hashtable);
if (NULL != block) {
u64 bytenr;
u64 bytenr = 0;
struct list_head *elem_ref_to;
struct list_head *tmp_ref_to;

Expand Down Expand Up @@ -2777,9 +2777,10 @@ int btrfsic_submit_bh(int rw, struct buffer_head *bh)
printk(KERN_INFO
"submit_bh(rw=0x%x, blocknr=%lu (bytenr %llu),"
" size=%lu, data=%p, bdev=%p)\n",
rw, bh->b_blocknr,
(unsigned long long)dev_bytenr, bh->b_size,
bh->b_data, bh->b_bdev);
rw, (unsigned long)bh->b_blocknr,
(unsigned long long)dev_bytenr,
(unsigned long)bh->b_size, bh->b_data,
bh->b_bdev);
btrfsic_process_written_block(dev_state, dev_bytenr,
bh->b_data, bh->b_size, NULL,
NULL, bh, rw);
Expand Down Expand Up @@ -2844,7 +2845,7 @@ void btrfsic_submit_bio(int rw, struct bio *bio)
printk(KERN_INFO
"submit_bio(rw=0x%x, bi_vcnt=%u,"
" bi_sector=%lu (bytenr %llu), bi_bdev=%p)\n",
rw, bio->bi_vcnt, bio->bi_sector,
rw, bio->bi_vcnt, (unsigned long)bio->bi_sector,
(unsigned long long)dev_bytenr,
bio->bi_bdev);

Expand Down

0 comments on commit 805ea56

Please sign in to comment.