diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-29 11:59:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-29 11:59:12 -0500 |
| commit | 883381d9f1c5a6329bbb796e23ae52c939940310 (patch) | |
| tree | b6b862d7391d537e309c6dd3798e56350c8b996d /fs | |
| parent | 0e500b6d23b5e99b6011047a53c4aeec78a41af8 (diff) | |
| parent | 4c81f045c0bd2cbb78cc6446a4cd98038fe11a2e (diff) | |
Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix racy use-after-free in ext4_end_io_dio()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index fffec40d5996..848f436df29f 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -2807,8 +2807,8 @@ out: | |||
| 2807 | spin_unlock_irqrestore(&ei->i_completed_io_lock, flags); | 2807 | spin_unlock_irqrestore(&ei->i_completed_io_lock, flags); |
| 2808 | 2808 | ||
| 2809 | /* queue the work to convert unwritten extents to written */ | 2809 | /* queue the work to convert unwritten extents to written */ |
| 2810 | queue_work(wq, &io_end->work); | ||
| 2811 | iocb->private = NULL; | 2810 | iocb->private = NULL; |
| 2811 | queue_work(wq, &io_end->work); | ||
| 2812 | 2812 | ||
| 2813 | /* XXX: probably should move into the real I/O completion handler */ | 2813 | /* XXX: probably should move into the real I/O completion handler */ |
| 2814 | inode_dio_done(inode); | 2814 | inode_dio_done(inode); |