diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-08 08:06:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-08 08:06:40 -0700 |
| commit | c77e9e68269bf50573ce130b5d95ff6e539dbcf8 (patch) | |
| tree | 99edc1b070717e18f5958f934bc3921cfed2ce1f /include/linux/backing-dev.h | |
| parent | 31016e9941be85e8c487b1f3c45d253eda356715 (diff) | |
| parent | 83ba7b071f30f7c01f72518ad72d5cd203c27502 (diff) | |
| download | op-kernel-dev-c77e9e68269bf50573ce130b5d95ff6e539dbcf8.zip op-kernel-dev-c77e9e68269bf50573ce130b5d95ff6e539dbcf8.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
writeback: simplify the write back thread queue
writeback: split writeback_inodes_wb
writeback: remove writeback_inodes_wbc
fs-writeback: fix kernel-doc warnings
splice: check f_mode for seekable file
splice: direct_splice_actor() should not use pos in sd
Diffstat (limited to 'include/linux/backing-dev.h')
| -rw-r--r-- | include/linux/backing-dev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index 9ae2889..e9aec0d 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h @@ -82,8 +82,6 @@ struct backing_dev_info { struct bdi_writeback wb; /* default writeback info for this bdi */ spinlock_t wb_lock; /* protects update side of wb_list */ struct list_head wb_list; /* the flusher threads hanging off this bdi */ - unsigned long wb_mask; /* bitmask of registered tasks */ - unsigned int wb_cnt; /* number of registered tasks */ struct list_head work_list; |
