diff --git a/[refs] b/[refs] index 3370f1dd6141..e7d4db35674b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5ee7305ae03e43dbe2b0e346232975f793ad0eb +refs/heads/master: dfd20b2b174d3a9b258ea3b7a35ead33576587b1 diff --git a/trunk/drivers/block/brd.c b/trunk/drivers/block/brd.c index f1a29f8e9d33..9bf4371755f2 100644 --- a/trunk/drivers/block/brd.c +++ b/trunk/drivers/block/brd.c @@ -117,13 +117,13 @@ static struct page *brd_insert_page(struct brd_device *brd, sector_t sector) spin_lock(&brd->brd_lock); idx = sector >> PAGE_SECTORS_SHIFT; + page->index = idx; if (radix_tree_insert(&brd->brd_pages, idx, page)) { __free_page(page); page = radix_tree_lookup(&brd->brd_pages, idx); BUG_ON(!page); BUG_ON(page->index != idx); - } else - page->index = idx; + } spin_unlock(&brd->brd_lock); radix_tree_preload_end();