From: Azat Khuzhin <a3at.mail@gmail.com>
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu, Azat Khuzhin <a3at.mail@gmail.com>
Subject: [PATCH 2/3] tune2fs: remove_journal_device(): use the correct block to find jsb
Date: Wed, 9 Jul 2014 00:41:21 +0400 [thread overview]
Message-ID: <1404852082-1550-3-git-send-email-a3at.mail@gmail.com> (raw)
In-Reply-To: <1404852082-1550-1-git-send-email-a3at.mail@gmail.com>
Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com>
---
misc/tune2fs.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 0e7caf2..811cb4d 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -193,6 +193,7 @@ static int remove_journal_device(ext2_filsys fs)
errcode_t retval;
int commit_remove_journal = 0;
io_manager io_ptr;
+ int start;
if (f_flag)
commit_remove_journal = 1; /* force removal even if error */
@@ -229,8 +230,10 @@ static int remove_journal_device(ext2_filsys fs)
goto no_valid_journal;
}
+ start = ext2fs_journal_sb_start(fs->blocksize);
/* Get the journal superblock */
- if ((retval = io_channel_read_blk64(jfs->io, 1, -SUPERBLOCK_SIZE, buf))) {
+ if ((retval = io_channel_read_blk64(jfs->io, start,
+ -SUPERBLOCK_SIZE, buf))) {
com_err(program_name, retval, "%s",
_("while reading journal superblock"));
goto no_valid_journal;
@@ -261,7 +264,8 @@ static int remove_journal_device(ext2_filsys fs)
jsb->s_nr_users = htonl(nr_users);
/* Write back the journal superblock */
- if ((retval = io_channel_write_blk64(jfs->io, 1, -SUPERBLOCK_SIZE, buf))) {
+ if ((retval = io_channel_write_blk64(jfs->io, start,
+ -SUPERBLOCK_SIZE, buf))) {
com_err(program_name, retval,
"while writing journal superblock.");
goto no_valid_journal;
--
2.0.0
next prev parent reply other threads:[~2014-07-08 20:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-08 20:41 [PATCH] e2fsprogs: journal code small cleanup and fixes Azat Khuzhin
2014-07-08 20:41 ` [PATCH 1/3] journal: use consts instead of 1024 and add helper for journal with 1k blocksize Azat Khuzhin
2014-07-08 23:30 ` Andreas Dilger
2014-07-09 3:51 ` Azat Khuzhin
2014-07-09 3:56 ` [PATCH 1/3 v2] " Azat Khuzhin
2014-07-09 4:46 ` Andreas Dilger
2014-07-09 4:54 ` Azat Khuzhin
2014-07-09 18:57 ` Darrick J. Wong
2014-07-09 19:36 ` Azat Khuzhin
2014-07-09 19:39 ` [PATCH 1/3 v3] " Azat Khuzhin
2014-07-09 20:33 ` Andreas Dilger
2014-07-08 20:41 ` Azat Khuzhin [this message]
2014-07-09 4:48 ` [PATCH 2/3] tune2fs: remove_journal_device(): use the correct block to find jsb Andreas Dilger
2014-07-08 20:41 ` [PATCH 3/3] tune2fs: update journal super block when changing UUID for fs Azat Khuzhin
2014-07-09 20:38 ` Andreas Dilger
2014-07-10 6:03 ` Azat Khuzhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1404852082-1550-3-git-send-email-a3at.mail@gmail.com \
--to=a3at.mail@gmail.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.