leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reiserfs: rearrange journal abort

Browse Source 
This patch kills off reiserfs_journal_abort as it is never called, and
combines __reiserfs_journal_abort_{soft,hard} into one function called
reiserfs_abort_journal, which performs the same work. It is silent
as opposed to the old version, since the message was always issued
after a regular 'abort' message.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Mahoney 2009-03-30 14:02:26 -04:00 committed by Linus Torvalds
parent c3a9c2109f
commit 32e8b10629
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/reiserfs/journal.c
View File

@ -4295,14 +4295,15 @@ static int do_journal_end(struct reiserfs_transaction_handle *th,
return journal->j_errno; return journal->j_errno;
} }
static void __reiserfs_journal_abort_hard(struct super_block *sb) /* Send the file system read only and refuse new transactions */
void reiserfs_abort_journal(struct super_block *sb, int errno)
{ {
struct reiserfs_journal *journal = SB_JOURNAL(sb); struct reiserfs_journal *journal = SB_JOURNAL(sb);
if (test_bit(J_ABORTED, &journal->j_state)) if (test_bit(J_ABORTED, &journal->j_state))
return; return;
printk(KERN_CRIT "REISERFS: Aborting journal for filesystem on %s\n", if (!journal->j_errno)
reiserfs_bdevname(sb)); journal->j_errno = errno;
sb->s_flags |= MS_RDONLY; sb->s_flags |= MS_RDONLY;
set_bit(J_ABORTED, &journal->j_state); set_bit(J_ABORTED, &journal->j_state);
@ -4312,19 +4313,3 @@ static void __reiserfs_journal_abort_hard(struct super_block *sb)
#endif #endif
} }
static void __reiserfs_journal_abort_soft(struct super_block *sb, int errno)
{
struct reiserfs_journal *journal = SB_JOURNAL(sb);
if (test_bit(J_ABORTED, &journal->j_state))
return;
if (!journal->j_errno)
journal->j_errno = errno;
__reiserfs_journal_abort_hard(sb);
}
void reiserfs_journal_abort(struct super_block *sb, int errno)
{
__reiserfs_journal_abort_soft(sb, errno);
}

2
fs/reiserfs/prints.c
View File

@ -386,7 +386,7 @@ void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...)
error_buf); error_buf);
sb->s_flags |= MS_RDONLY; sb->s_flags |= MS_RDONLY;
reiserfs_journal_abort(sb, errno); reiserfs_abort_journal(sb, errno);
} }
/* this prints internal nodes (4 keys/items in line) (dc_number, /* this prints internal nodes (4 keys/items in line) (dc_number,

2
include/linux/reiserfs_fs.h
View File

@ -1771,7 +1771,7 @@ int journal_begin(struct reiserfs_transaction_handle *,
struct super_block *p_s_sb, unsigned long); struct super_block *p_s_sb, unsigned long);
int journal_join_abort(struct reiserfs_transaction_handle *, int journal_join_abort(struct reiserfs_transaction_handle *,
struct super_block *p_s_sb, unsigned long); struct super_block *p_s_sb, unsigned long);
void reiserfs_journal_abort(struct super_block *sb, int errno); void reiserfs_abort_journal(struct super_block *sb, int errno);
void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...); void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...);
int reiserfs_allocate_list_bitmaps(struct super_block *s, int reiserfs_allocate_list_bitmaps(struct super_block *s,
struct reiserfs_list_bitmap *, unsigned int); struct reiserfs_list_bitmap *, unsigned int);