From: Sheng Yong <shengyong1@huawei.com>
To: jaegeuk@kernel.org, linux-f2fs-devel@lists.sourceforge.net
Subject: [PATCH trivial 6/7] f2fs-tools: update the format of output message
Date: Fri, 15 Jul 2016 20:01:24 +0800 [thread overview]
Message-ID: <1468584085-29090-6-git-send-email-shengyong1@huawei.com> (raw)
In-Reply-To: <1468584085-29090-1-git-send-email-shengyong1@huawei.com>
Signed-off-by: Sheng Yong <shengyong1@huawei.com>
---
fsck/mount.c | 4 ++--
fsck/resize.c | 4 ++--
mkfs/f2fs_format.c | 28 ++++++++++++++--------------
mkfs/f2fs_format_main.c | 4 ++--
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/fsck/mount.c b/fsck/mount.c
index f3b47fd..7af684f 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -1948,8 +1948,8 @@ static int check_sector_size(struct f2fs_super_block *sb)
DBG(1, "\tWriting super block, at offset 0x%08x\n", 0);
for (index = 0; index < 2; index++) {
if (dev_write(zero_buff, index * F2FS_BLKSIZE, F2FS_BLKSIZE)) {
- MSG(1, "\tError: While while writing supe_blk \
- on disk!!! index : %d\n", index);
+ MSG(1, "\tError: While while writing supe_blk "
+ "on disk!!! index : %d\n", index);
free(zero_buff);
return -1;
}
diff --git a/fsck/resize.c b/fsck/resize.c
index d2fd467..b53a6fa 100644
--- a/fsck/resize.c
+++ b/fsck/resize.c
@@ -123,8 +123,8 @@ static int get_new_sb(struct f2fs_sb_info *sbi, struct f2fs_super_block *sb)
if ((get_sb(segment_count_main) - 2) < config.new_reserved_segments ||
get_sb(segment_count_main) * blks_per_seg >
get_sb(block_count)) {
- MSG(0, "\tError: Device size is not sufficient for F2FS volume,\
- more segment needed =%u",
+ MSG(0, "\tError: Device size is not sufficient for F2FS volume, "
+ "more segment needed =%u",
config.new_reserved_segments -
(get_sb(segment_count_main) - 2));
return -1;
diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index 3173c30..6b1318a 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -284,8 +284,8 @@ static int f2fs_prepare_super_block(void)
if ((get_sb(segment_count_main) - 2) <
config.reserved_segments) {
- MSG(1, "\tError: Device size is not sufficient for F2FS volume,\
- more segment needed =%u",
+ MSG(1, "\tError: Device size is not sufficient for F2FS volume, "
+ "more segment needed =%u",
config.reserved_segments -
(get_sb(segment_count_main) - 2));
return -1;
@@ -300,8 +300,8 @@ static int f2fs_prepare_super_block(void)
set_sb(root_ino, 3);
if (total_zones <= 6) {
- MSG(1, "\tError: %d zones: Need more zones \
- by shrinking zone size\n", total_zones);
+ MSG(1, "\tError: %d zones: Need more zones "
+ "by shrinking zone size\n", total_zones);
return -1;
}
@@ -362,8 +362,8 @@ static int f2fs_init_sit_area(void)
DBG(1, "\tFilling sit area at offset 0x%08"PRIx64"\n", sit_seg_addr);
for (index = 0; index < (get_sb(segment_count_sit) / 2); index++) {
if (dev_fill(zero_buf, sit_seg_addr, seg_size)) {
- MSG(1, "\tError: While zeroing out the sit area \
- on disk!!!\n");
+ MSG(1, "\tError: While zeroing out the sit area "
+ "on disk!!!\n");
free(zero_buf);
return -1;
}
@@ -396,8 +396,8 @@ static int f2fs_init_nat_area(void)
DBG(1, "\tFilling nat area at offset 0x%08"PRIx64"\n", nat_seg_addr);
for (index = 0; index < get_sb(segment_count_nat) / 2; index++) {
if (dev_fill(nat_buf, nat_seg_addr, seg_size)) {
- MSG(1, "\tError: While zeroing out the nat area \
- on disk!!!\n");
+ MSG(1, "\tError: While zeroing out the nat area "
+ "on disk!!!\n");
free(nat_buf);
return -1;
}
@@ -510,8 +510,8 @@ static int f2fs_write_check_point_pack(void)
for (i = 0; i < get_sb(cp_payload); i++) {
cp_seg_blk_offset += blk_size_bytes;
if (dev_fill(cp_payload, cp_seg_blk_offset, blk_size_bytes)) {
- MSG(1, "\tError: While zeroing out the sit bitmap area \
- on disk!!!\n");
+ MSG(1, "\tError: While zeroing out the sit bitmap area "
+ "on disk!!!\n");
goto free_cp_payload;
}
}
@@ -650,8 +650,8 @@ static int f2fs_write_check_point_pack(void)
for (i = 0; i < get_sb(cp_payload); i++) {
cp_seg_blk_offset += blk_size_bytes;
if (dev_fill(cp_payload, cp_seg_blk_offset, blk_size_bytes)) {
- MSG(1, "\tError: While zeroing out the sit bitmap area \
- on disk!!!\n");
+ MSG(1, "\tError: While zeroing out the sit bitmap area "
+ "on disk!!!\n");
goto free_cp_payload;
}
}
@@ -689,8 +689,8 @@ static int f2fs_write_super_block(void)
DBG(1, "\tWriting super block, at offset 0x%08x\n", 0);
for (index = 0; index < 2; index++) {
if (dev_write(zero_buff, index * F2FS_BLKSIZE, F2FS_BLKSIZE)) {
- MSG(1, "\tError: While while writing supe_blk \
- on disk!!! index : %d\n", index);
+ MSG(1, "\tError: While while writing supe_blk "
+ "on disk!!! index : %d\n", index);
free(zero_buff);
return -1;
}
diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c
index f69d03f..94a7286 100644
--- a/mkfs/f2fs_format_main.c
+++ b/mkfs/f2fs_format_main.c
@@ -93,8 +93,8 @@ static void f2fs_parse_options(int argc, char *argv[])
break;
case 'l': /*v: volume label */
if (strlen(optarg) > 512) {
- MSG(0, "Error: Volume Label should be less than\
- 512 characters\n");
+ MSG(0, "Error: Volume Label should be less than "
+ "512 characters\n");
mkfs_usage();
}
config.vol_label = optarg;
--
2.7.1
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
next prev parent reply other threads:[~2016-07-15 12:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 12:01 [PATCH trivial 1/7] dump.f2fs: show inode->i_dir_level Sheng Yong
2016-07-15 12:01 ` [PATCH trivial 2/7] f2fs.fsck: fix endianess Sheng Yong
2016-07-15 12:01 ` [PATCH trivial 3/7] fsck.f2fs: correct variable type and name Sheng Yong
2016-07-15 12:01 ` [PATCH trivial 4/7] fsck.f2fs: fix typo Sheng Yong
2016-07-15 12:01 ` [PATCH trivial 5/7] fsck.f2fs: free nat entry cache Sheng Yong
2016-07-15 12:01 ` Sheng Yong [this message]
2016-07-15 12:01 ` [PATCH trivial 7/7] fsck.f2fs: clean up duplicated code Sheng Yong
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=1468584085-29090-6-git-send-email-shengyong1@huawei.com \
--to=shengyong1@huawei.com \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).