git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
fs
/
jfs
/
jfs_logmgr.c
diff --git
a/fs/jfs/jfs_logmgr.c
b/fs/jfs/jfs_logmgr.c
index
5065baa
..
6a3f00d
100644
(file)
--- a/
fs/jfs/jfs_logmgr.c
+++ b/
fs/jfs/jfs_logmgr.c
@@
-62,7
+62,6
@@
#include <linux/fs.h>
#include <linux/blkdev.h>
#include <linux/interrupt.h>
#include <linux/fs.h>
#include <linux/blkdev.h>
#include <linux/interrupt.h>
-#include <linux/smp_lock.h>
#include <linux/completion.h>
#include <linux/kthread.h>
#include <linux/buffer_head.h> /* for sync_blockdev() */
#include <linux/completion.h>
#include <linux/kthread.h>
#include <linux/buffer_head.h> /* for sync_blockdev() */
@@
-1590,7
+1589,7
@@
void jfs_flush_journal(struct jfs_log *log, int wait)
set_current_state(TASK_UNINTERRUPTIBLE);
LOGGC_UNLOCK(log);
schedule();
set_current_state(TASK_UNINTERRUPTIBLE);
LOGGC_UNLOCK(log);
schedule();
-
current->state = TASK_RUNNING
;
+
__set_current_state(TASK_RUNNING)
;
LOGGC_LOCK(log);
remove_wait_queue(&target->gcwait, &__wait);
}
LOGGC_LOCK(log);
remove_wait_queue(&target->gcwait, &__wait);
}
@@
-2354,14
+2353,15
@@
int jfsIOWait(void *arg)
lbmStartIO(bp);
spin_lock_irq(&log_redrive_lock);
}
lbmStartIO(bp);
spin_lock_irq(&log_redrive_lock);
}
- spin_unlock_irq(&log_redrive_lock);
if (freezing(current)) {
if (freezing(current)) {
+ spin_unlock_irq(&log_redrive_lock);
refrigerator();
} else {
set_current_state(TASK_INTERRUPTIBLE);
refrigerator();
} else {
set_current_state(TASK_INTERRUPTIBLE);
+ spin_unlock_irq(&log_redrive_lock);
schedule();
schedule();
-
current->state = TASK_RUNNING
;
+
__set_current_state(TASK_RUNNING)
;
}
} while (!kthread_should_stop());
}
} while (!kthread_should_stop());