diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/direct-io.c | 2 | ||||
-rw-r--r-- | fs/reiserfs/journal.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c index d9d0833444f5..1e88d8d1d2a9 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c | |||
@@ -439,7 +439,7 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio) | |||
439 | * Wait on and process all in-flight BIOs. This must only be called once | 439 | * Wait on and process all in-flight BIOs. This must only be called once |
440 | * all bios have been issued so that the refcount can only decrease. | 440 | * all bios have been issued so that the refcount can only decrease. |
441 | * This just waits for all bios to make it through dio_bio_complete. IO | 441 | * This just waits for all bios to make it through dio_bio_complete. IO |
442 | * errors are propogated through dio->io_error and should be propogated via | 442 | * errors are propagated through dio->io_error and should be propagated via |
443 | * dio_complete(). | 443 | * dio_complete(). |
444 | */ | 444 | */ |
445 | static void dio_await_completion(struct dio *dio) | 445 | static void dio_await_completion(struct dio *dio) |
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index e073fd86cf60..f25086aeef5f 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -1110,7 +1110,7 @@ static int flush_commit_list(struct super_block *s, | |||
1110 | if (!barrier) { | 1110 | if (!barrier) { |
1111 | /* If there was a write error in the journal - we can't commit | 1111 | /* If there was a write error in the journal - we can't commit |
1112 | * this transaction - it will be invalid and, if successful, | 1112 | * this transaction - it will be invalid and, if successful, |
1113 | * will just end up propogating the write error out to | 1113 | * will just end up propagating the write error out to |
1114 | * the file system. */ | 1114 | * the file system. */ |
1115 | if (likely(!retval && !reiserfs_is_journal_aborted (journal))) { | 1115 | if (likely(!retval && !reiserfs_is_journal_aborted (journal))) { |
1116 | if (buffer_dirty(jl->j_commit_bh)) | 1116 | if (buffer_dirty(jl->j_commit_bh)) |
@@ -1125,7 +1125,7 @@ static int flush_commit_list(struct super_block *s, | |||
1125 | 1125 | ||
1126 | /* If there was a write error in the journal - we can't commit this | 1126 | /* If there was a write error in the journal - we can't commit this |
1127 | * transaction - it will be invalid and, if successful, will just end | 1127 | * transaction - it will be invalid and, if successful, will just end |
1128 | * up propogating the write error out to the filesystem. */ | 1128 | * up propagating the write error out to the filesystem. */ |
1129 | if (unlikely(!buffer_uptodate(jl->j_commit_bh))) { | 1129 | if (unlikely(!buffer_uptodate(jl->j_commit_bh))) { |
1130 | #ifdef CONFIG_REISERFS_CHECK | 1130 | #ifdef CONFIG_REISERFS_CHECK |
1131 | reiserfs_warning(s, "journal-615: buffer write failed"); | 1131 | reiserfs_warning(s, "journal-615: buffer write failed"); |