Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32e8b106 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files

reiserfs: rearrange journal abort 



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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c3a9c210

fs/reiserfs/journal.c

+4 −19
Original line number Diff line number Diff line
@@ -4295,14 +4295,15 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, 
	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);

	if (test_bit(J_ABORTED, &journal->j_state))

		return;



	printk(KERN_CRIT "REISERFS: Aborting journal for filesystem on %s\n",

	       reiserfs_bdevname(sb));

	if (!journal->j_errno)

		journal->j_errno = errno;



	sb->s_flags |= MS_RDONLY;

	set_bit(J_ABORTED, &journal->j_state);
@@ -4312,19 +4313,3 @@ static void __reiserfs_journal_abort_hard(struct super_block *sb) 
#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);

}

fs/reiserfs/prints.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...) 
	       error_buf);



	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,

include/linux/reiserfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -1771,7 +1771,7 @@ int journal_begin(struct reiserfs_transaction_handle *, 
		  struct super_block *p_s_sb, unsigned long);

int journal_join_abort(struct reiserfs_transaction_handle *,

		       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, ...);

int reiserfs_allocate_list_bitmaps(struct super_block *s,

				   struct reiserfs_list_bitmap *, unsigned int);