Merge remote-tracking branch 'spi/for-next'

[karo-tx-linux.git] / fs / jfs / jfs_lock.h

diff --git a/fs/jfs/jfs_lock.h b/fs/jfs/jfs_lock.h
index 7d78e83d7c40eaee39c0b9e67b6210b5ea40504c..ecf04882265ea5f5526da109e7b82761f38c6f21 100644 (file)
--- a/fs/jfs/jfs_lock.h
+++ b/fs/jfs/jfs_lock.h
@@ -42,10 +42,10 @@ do {                                                        \
                if (cond)                               \
                        break;                          \
                unlock_cmd;                             \
-               schedule();                             \
+               io_schedule();                          \
                lock_cmd;                               \
        }                                               \
-       current->state = TASK_RUNNING;                  \
+       __set_current_state(TASK_RUNNING);                      \
        remove_wait_queue(&wq, &__wait);                \
 } while (0)