Skip to content

Commit

Permalink
Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/t…
Browse files Browse the repository at this point in the history
…ytso/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()
  • Loading branch information
torvalds committed Nov 29, 2011
2 parents 0e500b6 + 4c81f04 commit 883381d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/ext4/inode.c
Expand Up @@ -2807,8 +2807,8 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
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);
Expand Down

0 comments on commit 883381d

Please sign in to comment.