evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "block: Fix oops in locked_inode_to_wb_and_lock_list()"

Browse source
This commit is contained in:
Linux Build Service Account 2017-10-31 16:54:19 -07:00 • committed by Gerrit - the friendly Code Review server
commit aedf62a2ba
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/block_dev.c
View file

@ -558,6 +558,8 @@ static void bdev_evict_inode(struct inode *inode)
} }
list_del_init(&bdev->bd_list); list_del_init(&bdev->bd_list);
spin_unlock(&bdev_lock); spin_unlock(&bdev_lock);
/* Detach inode from wb early as bdi_put() may free bdi->wb */
inode_detach_wb(inode);
if (bdev->bd_bdi != &noop_backing_dev_info) { if (bdev->bd_bdi != &noop_backing_dev_info) {
bdi_put(bdev->bd_bdi); bdi_put(bdev->bd_bdi);
bdev->bd_bdi = &noop_backing_dev_info; bdev->bd_bdi = &noop_backing_dev_info;
@ -1547,12 +1549,6 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
kill_bdev(bdev); kill_bdev(bdev);
bdev_write_inode(bdev); bdev_write_inode(bdev);
/*
* Detaching bdev inode from its wb in __destroy_inode()
* is too late: the queue which embeds its bdi (along with
* root wb) can be gone as soon as we put_disk() below.
*/
inode_detach_wb(bdev->bd_inode);
} }
if (bdev->bd_contains == bdev) { if (bdev->bd_contains == bdev) {
if (disk->fops->release) if (disk->fops->release)

1
include/linux/writeback.h
View file

@ -224,6 +224,7 @@ static inline void inode_attach_wb(struct inode *inode, struct page *page)
static inline void inode_detach_wb(struct inode *inode) static inline void inode_detach_wb(struct inode *inode)
{ {
if (inode->i_wb) { if (inode->i_wb) {
WARN_ON_ONCE(!(inode->i_state & I_CLEAR));
wb_put(inode->i_wb); wb_put(inode->i_wb);
inode->i_wb = NULL; inode->i_wb = NULL;
} }