Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 240f6e2dc7ee..848f436df29f 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2270,6 +2270,7 @@ retry:
                         ext4_msg(inode->i_sb, KERN_CRIT, "%s: jbd2_start: "
                                "%ld pages, ino %lu; err %d", __func__,
                                 wbc->nr_to_write, inode->i_ino, ret);
+                        blk_finish_plug(&plug);
                         goto out_writepages;
                 }
 
@@ -2806,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);