diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-29 20:59:12 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-29 20:59:12 +0400 |
| commit | 883381d9f1c5a6329bbb796e23ae52c939940310 (patch) | |
| tree | b6b862d7391d537e309c6dd3798e56350c8b996d | |
| parent | 0e500b6d23b5e99b6011047a53c4aeec78a41af8 (diff) | |
| parent | 4c81f045c0bd2cbb78cc6446a4cd98038fe11a2e (diff) | |
| download | linux-883381d9f1c5a6329bbb796e23ae52c939940310.tar.xz | |
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()
| -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: spin_unlock_irqrestore(&ei->i_completed_io_lock, flags); /* queue the work to convert unwritten extents to written */ - queue_work(wq, &io_end->work); iocb->private = NULL; + queue_work(wq, &io_end->work); /* XXX: probably should move into the real I/O completion handler */ inode_dio_done(inode); |