diff options
| author | Jens Axboe <axboe@carl.(none)> | 2009-07-10 22:44:32 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@carl.(none)> | 2009-07-10 22:44:32 +0200 |
| commit | bdb473bcf205cc30af24a9a2dafe26f2a88f0ef6 (patch) | |
| tree | 4090cb7eacc23c7eb2e4ef2da6ea23c5b1ab1202 /drivers | |
| parent | ad95b8628e798b09ea3cd989e33f1c2b786fb8ce (diff) | |
| parent | 74111ddca498f4242d70be7a56a4c011c6de0ee3 (diff) | |
Merge branch 'writeback' into for-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/aoe/aoeblk.c | 1 | ||||
| -rw-r--r-- | drivers/char/mem.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c index 2307a271bdc9..0efb8fccb619 100644 --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c @@ -265,6 +265,7 @@ aoeblk_gdalloc(void *vp) } blk_queue_make_request(&d->blkq, aoeblk_make_request); + d->blkq.backing_dev_info.name = "aoe"; if (bdi_init(&d->blkq.backing_dev_info)) goto err_mempool; spin_lock_irqsave(&d->lock, flags); diff --git a/drivers/char/mem.c b/drivers/char/mem.c index afa8813e737a..645237bda682 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -822,6 +822,7 @@ static const struct file_operations zero_fops = { * - permits private mappings, "copies" are taken of the source of zeros */ static struct backing_dev_info zero_bdi = { + .name = "char/mem", .capabilities = BDI_CAP_MAP_COPY, }; |