projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'media/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[linux-2.6-block.git]
/
fs
/
jbd2
/
checkpoint.c
diff --git
a/fs/jbd2/checkpoint.c
b/fs/jbd2/checkpoint.c
index 988b32ed4c8737db045b517714ee8bcc5698405f..4227dc4f7437d51c8171709a7e09eef46a09f8cd 100644
(file)
--- a/
fs/jbd2/checkpoint.c
+++ b/
fs/jbd2/checkpoint.c
@@
-390,7
+390,7
@@
int jbd2_cleanup_journal_tail(journal_t *journal)
unsigned long blocknr;
if (is_journal_aborted(journal))
unsigned long blocknr;
if (is_journal_aborted(journal))
- return
1
;
+ return
-EIO
;
if (!jbd2_journal_get_log_tail(journal, &first_tid, &blocknr))
return 1;
if (!jbd2_journal_get_log_tail(journal, &first_tid, &blocknr))
return 1;
@@
-405,10
+405,9
@@
int jbd2_cleanup_journal_tail(journal_t *journal)
* jbd2_cleanup_journal_tail() doesn't get called all that often.
*/
if (journal->j_flags & JBD2_BARRIER)
* jbd2_cleanup_journal_tail() doesn't get called all that often.
*/
if (journal->j_flags & JBD2_BARRIER)
- blkdev_issue_flush(journal->j_fs_dev, GFP_
KERNEL
, NULL);
+ blkdev_issue_flush(journal->j_fs_dev, GFP_
NOFS
, NULL);
- __jbd2_update_log_tail(journal, first_tid, blocknr);
- return 0;
+ return __jbd2_update_log_tail(journal, first_tid, blocknr);
}
}