diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-07 15:34:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-07 15:34:09 -0700 |
| commit | ac904ae6e6f0a56be7b9a1cf66fbd50dd025fb06 (patch) | |
| tree | 381a6ad5886a0da78392c2f5bb817dd5d75ea97f /fs | |
| parent | 4c2a8499a450b6582eb5637a8f0d472168355ddd (diff) | |
| parent | 8ba8682107ee2ca3347354e018865d8e1967c5f4 (diff) | |
| download | linux-ac904ae6e6f0a56be7b9a1cf66fbd50dd025fb06.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block IO fixes from Jens Axboe:
"Three small fixes that have been queued up and tested for this series:
- A bug fix for xen-blkfront from Bob Liu, fixing an issue with
incomplete requests during migration.
- A fix for an ancient issue in retrieving the IO priority of a
different PID than self, preventing that task from going away while
we access it. From Omar.
- A writeback fix from Tahsin, fixing a case where we'd call ihold()
with a zero ref count inode"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: fix use-after-free in sys_ioprio_get()
writeback: inode cgroup wb switch should not call ihold()
xen-blkfront: save uncompleted reqs in blkfront_resume()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fs-writeback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 989a2cef6b76..fe7e83a45eff 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -483,9 +483,9 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id) goto out_free; } inode->i_state |= I_WB_SWITCH; + __iget(inode); spin_unlock(&inode->i_lock); - ihold(inode); isw->inode = inode; atomic_inc(&isw_nr_in_flight); |