diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 21:45:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 21:45:04 +0200 |
| commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
| tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /fs/reiserfs/journal.c | |
| parent | [PATCH] crc16: remove w1 specific comments. (diff) | |
| parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
| download | linux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.tar.xz linux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.zip | |
Merge ../torvalds-2.6/
Diffstat (limited to 'fs/reiserfs/journal.c')
| -rw-r--r-- | fs/reiserfs/journal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index a8e29e9bbbd0..4b15761434bc 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c @@ -2868,8 +2868,7 @@ static void let_transaction_grow(struct super_block *sb, unsigned long trans_id) struct reiserfs_journal *journal = SB_JOURNAL(sb); unsigned long bcount = journal->j_bcount; while (1) { - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(1); + schedule_timeout_uninterruptible(1); journal->j_current_jl->j_state |= LIST_COMMIT_PENDING; while ((atomic_read(&journal->j_wcount) > 0 || atomic_read(&journal->j_jlock)) && |