diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-03 16:57:16 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-03 16:57:16 (GMT) |
commit | 86652188f345edec56b0074a65f6db17f16eb359 (patch) | |
tree | cbaf3a5e62b0c05ac74043685f63abde29a80c25 /fs/jfs/jfs_logmgr.c | |
parent | 14a9e5c09d13aa36b88ea54b8b6134b60ff2a410 (diff) | |
parent | 73aaa22d5ffb2630456bac2f9a4ed9b81d0d7271 (diff) | |
download | linux-fsl-qoriq-86652188f345edec56b0074a65f6db17f16eb359.tar.xz |
Merge tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy
Pull jfs fixes from David Kleikamp:
"A couple fixes for jfs"
(What's with the unhelpful pull request "explanations" from fs people
today?)
* tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy:
jfs: fix a couple races
jfs: avoid undefined behavior from left-shifting by 32 bits
Diffstat (limited to 'fs/jfs/jfs_logmgr.c')
-rw-r--r-- | fs/jfs/jfs_logmgr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 2eb952c..cbe48ea 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -1058,7 +1058,8 @@ static int lmLogSync(struct jfs_log * log, int hard_sync) */ void jfs_syncpt(struct jfs_log *log, int hard_sync) { LOG_LOCK(log); - lmLogSync(log, hard_sync); + if (!test_bit(log_QUIESCE, &log->flag)) + lmLogSync(log, hard_sync); LOG_UNLOCK(log); } |