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_txnmgr.c
diff --git
a/fs/jfs/jfs_txnmgr.c
b/fs/jfs/jfs_txnmgr.c
index
03893ac
..
25430d0
100644
(file)
--- a/
fs/jfs/jfs_txnmgr.c
+++ b/
fs/jfs/jfs_txnmgr.c
@@
-44,7
+44,6
@@
#include <linux/fs.h>
#include <linux/vmalloc.h>
#include <linux/fs.h>
#include <linux/vmalloc.h>
-#include <linux/smp_lock.h>
#include <linux/completion.h>
#include <linux/freezer.h>
#include <linux/module.h>
#include <linux/completion.h>
#include <linux/freezer.h>
#include <linux/module.h>
@@
-136,7
+135,7
@@
static inline void TXN_SLEEP_DROP_LOCK(wait_queue_head_t * event)
set_current_state(TASK_UNINTERRUPTIBLE);
TXN_UNLOCK();
io_schedule();
set_current_state(TASK_UNINTERRUPTIBLE);
TXN_UNLOCK();
io_schedule();
-
current->state = TASK_RUNNING
;
+
__set_current_state(TASK_RUNNING)
;
remove_wait_queue(event, &wait);
}
remove_wait_queue(event, &wait);
}
@@
-2798,7
+2797,7
@@
int jfs_lazycommit(void *arg)
set_current_state(TASK_INTERRUPTIBLE);
LAZY_UNLOCK(flags);
schedule();
set_current_state(TASK_INTERRUPTIBLE);
LAZY_UNLOCK(flags);
schedule();
-
current->state = TASK_RUNNING
;
+
__set_current_state(TASK_RUNNING)
;
remove_wait_queue(&jfs_commit_thread_wait, &wq);
}
} while (!kthread_should_stop());
remove_wait_queue(&jfs_commit_thread_wait, &wq);
}
} while (!kthread_should_stop());
@@
-2990,7
+2989,7
@@
int jfs_sync(void *arg)
set_current_state(TASK_INTERRUPTIBLE);
TXN_UNLOCK();
schedule();
set_current_state(TASK_INTERRUPTIBLE);
TXN_UNLOCK();
schedule();
-
current->state = TASK_RUNNING
;
+
__set_current_state(TASK_RUNNING)
;
}
} while (!kthread_should_stop());
}
} while (!kthread_should_stop());