summaryrefslogtreecommitdiff
path: root/fs/reiserfs/prints.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2009-03-30 22:02:26 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 23:16:36 +0400
commit32e8b1062915d00d07d3b88a95174648e369b6a3 (patch)
treef8d9da27137667072ca1f826c760fda1717a1c8d /fs/reiserfs/prints.c
parentc3a9c2109f84882b9b3178f6b1838d550d3df0ec (diff)
downloadlinux-32e8b1062915d00d07d3b88a95174648e369b6a3.tar.xz
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: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/prints.c')
-rw-r--r--fs/reiserfs/prints.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index 1964acb6eb17..84f3f69652e3 100644
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -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,