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
49618dd
..
efbb586
100644
(file)
--- a/
fs/jfs/jfs_txnmgr.c
+++ b/
fs/jfs/jfs_txnmgr.c
@@
-842,7
+842,7
@@
struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
TXN_UNLOCK();
release_metapage(mp);
TXN_LOCK();
- xtid = tlck->tid; /* reaquire after dropping TXN_LOCK */
+ xtid = tlck->tid; /* rea
c
quire after dropping TXN_LOCK */
jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d",
tid, xtid, lid);