X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fjfs%2Fjfs_lock.h;h=ecf04882265ea5f5526da109e7b82761f38c6f21;hb=9ea319b61613085f501a79cf8d405cb221d084f3;hp=7d78e83d7c40eaee39c0b9e67b6210b5ea40504c;hpb=e30fdb1e026c2d05f216d2e5a25bfafdfd261ec2;p=linux-2.6 diff --git a/fs/jfs/jfs_lock.h b/fs/jfs/jfs_lock.h index 7d78e83d7c..ecf0488226 100644 --- 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)