diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 07:45:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 07:45:38 -0700 |
| commit | a3eb51ecfa1d7be689f05c9f12cb0fcf862c516e (patch) | |
| tree | 9995b3b9207c18a58ce99700f569b7bc2877e23c /fs/inode.c | |
| parent | fdaa45e95d2ef59a140d2fb2e487141f83f5a07c (diff) | |
| parent | 1ef7d9aa32a8ee054c4d4fdcd2ea537c04d61b2f (diff) | |
| download | kernel-crypto-a3eb51ecfa1d7be689f05c9f12cb0fcf862c516e.tar.gz kernel-crypto-a3eb51ecfa1d7be689f05c9f12cb0fcf862c516e.tar.xz kernel-crypto-a3eb51ecfa1d7be689f05c9f12cb0fcf862c516e.zip | |
Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block
* 'writeback' of git://git.kernel.dk/linux-2.6-block:
writeback: fix possible bdi writeback refcounting problem
writeback: Fix bdi use after free in wb_work_complete()
writeback: improve scalability of bdi writeback work queues
writeback: remove smp_mb(), it's not needed with list_add_tail_rcu()
writeback: use schedule_timeout_interruptible()
writeback: add comments to bdi_work structure
writeback: splice dirty inode entries to default bdi on bdi_destroy()
writeback: separate starting of sync vs opportunistic writeback
writeback: inline allocation failure handling in bdi_alloc_queue_work()
writeback: use RCU to protect bdi_list
writeback: only use bdi_writeback_all() for WB_SYNC_NONE writeout
fs: Assign bdi in super_block
writeback: make wb_writeback() take an argument structure
writeback: merely wakeup flusher thread if work allocation fails for WB_SYNC_NONE
writeback: get rid of wbc->for_writepages
fs: remove bdev->bd_inode_backing_dev_info
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/inode.c b/fs/inode.c index ae7b67e4866..b2ba83d2c4e 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -182,9 +182,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode) if (sb->s_bdev) { struct backing_dev_info *bdi; - bdi = sb->s_bdev->bd_inode_backing_dev_info; - if (!bdi) - bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info; + bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info; mapping->backing_dev_info = bdi; } inode->i_private = NULL; |