diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-22 09:12:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-22 09:12:37 -0700 |
| commit | b68e9d4581cbb211be3e174d3445b4917aacbcf6 (patch) | |
| tree | c7ea337b623abacdb546d30a39037dd029f20a34 /mm | |
| parent | 62f1b494d82272819570d715eb6633887a9fde20 (diff) | |
| parent | 692ebd17c2905313fff3c504c249c6a0faad16ec (diff) | |
| download | linux-b68e9d4581cbb211be3e174d3445b4917aacbcf6.tar.gz linux-b68e9d4581cbb211be3e174d3445b4917aacbcf6.tar.bz2 linux-b68e9d4581cbb211be3e174d3445b4917aacbcf6.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
bdi: Fix warnings in __mark_inode_dirty for /dev/zero and friends
char: Mark /dev/zero and /dev/kmem as not capable of writeback
bdi: Initialize noop_backing_dev_info properly
cfq-iosched: fix a kernel OOPs when usb key is inserted
block: fix blk_rq_map_kern bio direction flag
cciss: freeing uninitialized data on error path
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/backing-dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index c2bf86f470ed..65d420499a61 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -30,6 +30,7 @@ EXPORT_SYMBOL_GPL(default_backing_dev_info); struct backing_dev_info noop_backing_dev_info = { .name = "noop", + .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK, }; EXPORT_SYMBOL_GPL(noop_backing_dev_info); @@ -243,6 +244,7 @@ static int __init default_bdi_init(void) err = bdi_init(&default_backing_dev_info); if (!err) bdi_register(&default_backing_dev_info, NULL, "default"); + err = bdi_init(&noop_backing_dev_info); return err; } |