diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-05 22:11:03 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-07 02:16:31 -0400 |
| commit | 4385bab128911df14ab25f0b5ae1a48d7b53dd94 (patch) | |
| tree | d8c6f5557f09ebdf294eaba7eba01a140f8da78a /fs/reiserfs | |
| parent | db2a144bedd58b3dcf19950c2f476c58c9f39d18 (diff) | |
make blkdev_put() return void
same story as with the previous patches - note that return
value of blkdev_close() is lost, since there's nowhere the
caller (__fput()) could return it to.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/journal.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index afcadcc03e8a..742fdd4c209a 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
| @@ -97,7 +97,7 @@ static int flush_commit_list(struct super_block *s, | |||
| 97 | static int can_dirty(struct reiserfs_journal_cnode *cn); | 97 | static int can_dirty(struct reiserfs_journal_cnode *cn); |
| 98 | static int journal_join(struct reiserfs_transaction_handle *th, | 98 | static int journal_join(struct reiserfs_transaction_handle *th, |
| 99 | struct super_block *sb, unsigned long nblocks); | 99 | struct super_block *sb, unsigned long nblocks); |
| 100 | static int release_journal_dev(struct super_block *super, | 100 | static void release_journal_dev(struct super_block *super, |
| 101 | struct reiserfs_journal *journal); | 101 | struct reiserfs_journal *journal); |
| 102 | static int dirty_one_transaction(struct super_block *s, | 102 | static int dirty_one_transaction(struct super_block *s, |
| 103 | struct reiserfs_journal_list *jl); | 103 | struct reiserfs_journal_list *jl); |
| @@ -2532,23 +2532,13 @@ static void journal_list_init(struct super_block *sb) | |||
| 2532 | SB_JOURNAL(sb)->j_current_jl = alloc_journal_list(sb); | 2532 | SB_JOURNAL(sb)->j_current_jl = alloc_journal_list(sb); |
| 2533 | } | 2533 | } |
| 2534 | 2534 | ||
| 2535 | static int release_journal_dev(struct super_block *super, | 2535 | static void release_journal_dev(struct super_block *super, |
| 2536 | struct reiserfs_journal *journal) | 2536 | struct reiserfs_journal *journal) |
| 2537 | { | 2537 | { |
| 2538 | int result; | ||
| 2539 | |||
| 2540 | result = 0; | ||
| 2541 | |||
| 2542 | if (journal->j_dev_bd != NULL) { | 2538 | if (journal->j_dev_bd != NULL) { |
| 2543 | result = blkdev_put(journal->j_dev_bd, journal->j_dev_mode); | 2539 | blkdev_put(journal->j_dev_bd, journal->j_dev_mode); |
| 2544 | journal->j_dev_bd = NULL; | 2540 | journal->j_dev_bd = NULL; |
| 2545 | } | 2541 | } |
| 2546 | |||
| 2547 | if (result != 0) { | ||
| 2548 | reiserfs_warning(super, "sh-457", | ||
| 2549 | "Cannot release journal device: %i", result); | ||
| 2550 | } | ||
| 2551 | return result; | ||
| 2552 | } | 2542 | } |
| 2553 | 2543 | ||
| 2554 | static int journal_init_dev(struct super_block *super, | 2544 | static int journal_init_dev(struct super_block *super, |
