Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2...
Joel Becker [Mon, 22 Aug 2011 04:02:57 +0000 (21:02 -0700)]
1  2 
fs/ocfs2/aops.c
fs/ocfs2/file.c
fs/ocfs2/super.c

diff --cc fs/ocfs2/aops.c
@@@ -577,20 -567,9 +576,18 @@@ static void ocfs2_dio_end_io(struct kio
        /* this io's submitter should not have unlocked this before we could */
        BUG_ON(!ocfs2_iocb_is_rw_locked(iocb));
  
-       if (ocfs2_iocb_is_sem_locked(iocb)) {
-               up_read(&inode->i_alloc_sem);
+       if (ocfs2_iocb_is_sem_locked(iocb))
                ocfs2_iocb_clear_sem_locked(iocb);
-       }
  
 +      if (ocfs2_iocb_is_unaligned_aio(iocb)) {
 +              ocfs2_iocb_clear_unaligned_aio(iocb);
 +
 +              if (atomic_dec_and_test(&OCFS2_I(inode)->ip_unaligned_aio) &&
 +                  waitqueue_active(wq)) {
 +                      wake_up_all(wq);
 +              }
 +      }
 +
        ocfs2_iocb_clear_rw_locked(iocb);
  
        level = ocfs2_iocb_rw_locked_level(iocb);
diff --cc fs/ocfs2/file.c
Simple merge
Simple merge