Merge tag 'xfs-4.13-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
[muen/linux.git] / fs / xfs / xfs_inode.c
index 67bd5631166e2cedcdae71272b03caacbda9937a..ceef77c0416ad5833c2b513006496c8d57a4c62f 100644 (file)
@@ -622,12 +622,12 @@ __xfs_iflock(
        DEFINE_WAIT_BIT(wait, &ip->i_flags, __XFS_IFLOCK_BIT);
 
        do {
-               prepare_to_wait_exclusive(wq, &wait.wait, TASK_UNINTERRUPTIBLE);
+               prepare_to_wait_exclusive(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);
                if (xfs_isiflocked(ip))
                        io_schedule();
        } while (!xfs_iflock_nowait(ip));
 
-       finish_wait(wq, &wait.wait);
+       finish_wait(wq, &wait.wq_entry);
 }
 
 STATIC uint
@@ -2486,11 +2486,11 @@ __xfs_iunpin_wait(
        xfs_iunpin(ip);
 
        do {
-               prepare_to_wait(wq, &wait.wait, TASK_UNINTERRUPTIBLE);
+               prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);
                if (xfs_ipincount(ip))
                        io_schedule();
        } while (xfs_ipincount(ip));
-       finish_wait(wq, &wait.wait);
+       finish_wait(wq, &wait.wq_entry);
 }
 
 void