diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-10 01:07:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-10 01:07:48 +0100 |
| commit | a36ae95c4e220afb976dd9d0d813d01e882b7b59 (patch) | |
| tree | 5a128e3f6a5a0d29c9dfd81a116381452951318f /fs/ext4 | |
| parent | USB: ohci-s3c2410: add PM support (diff) | |
| parent | Linux 3.2-rc4 (diff) | |
| download | linux-a36ae95c4e220afb976dd9d0d813d01e882b7b59.tar.xz linux-a36ae95c4e220afb976dd9d0d813d01e882b7b59.zip | |
Merge v3.2-rc4 into usb-next
This lets us handle the PS3 merge easier, as well as syncing up with
other USB fixes already in the -rc4 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/ext4')
| -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); |