diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-04 06:33:44 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-04 06:33:44 +0900 |
| commit | 0ab60871b451b857206d7afc0d3033be866f76b4 (patch) | |
| tree | 72dd70aba74f00cf78eeba41817b4b56622fafcf /fs/jfs/jfs_logmgr.c | |
| parent | aa4f608478acb7ed69dfcff4f3c404100b78ac49 (diff) | |
| parent | 95bbb82f60c80808e5a49d8233c2de8451901531 (diff) | |
| download | linux-0ab60871b451b857206d7afc0d3033be866f76b4.tar.gz linux-0ab60871b451b857206d7afc0d3033be866f76b4.tar.bz2 linux-0ab60871b451b857206d7afc0d3033be866f76b4.zip | |
Merge tag 'jfs-3.10-rc5' of git://github.com/kleikamp/linux-shaggy
Pull jfs bugfixes from David Kleikamp:
"A couple jfs bug fixes for 3.10-rc5"
* tag 'jfs-3.10-rc5' of git://github.com/kleikamp/linux-shaggy:
fs/jfs: Add check if journaling to disk has been disabled in lbmRead()
jfs: Several bugs in jfs_freeze() and jfs_unfreeze()
Diffstat (limited to 'fs/jfs/jfs_logmgr.c')
| -rw-r--r-- | fs/jfs/jfs_logmgr.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index c57499dca89c..360d27c48887 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -2009,7 +2009,13 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp) bio->bi_end_io = lbmIODone; bio->bi_private = bp; - submit_bio(READ_SYNC, bio); + /*check if journaling to disk has been disabled*/ + if (log->no_integrity) { + bio->bi_size = 0; + lbmIODone(bio, 0); + } else { + submit_bio(READ_SYNC, bio); + } wait_event(bp->l_ioevent, (bp->l_flag != lbmREAD)); |