Patchwork libext2fs: fix a coding style for EXT2_NO_MTAB_FILE

login
register
mail settings
Submitter Zheng Liu
Date Aug. 5, 2013, 5:02 a.m.
Message ID <1375678963-7845-1-git-send-email-wenqing.lz@taobao.com>
Download mbox | patch
Permalink /patch/264572/
State New
Headers show

Comments

Zheng Liu - Aug. 5, 2013, 5:02 a.m.
From: Zheng Liu <wenqing.lz@taobao.com>

When we define an error in lib/ext2fs/ext2_err.et.in, we will always use
EXT2_ET_* prefix for a new error.  But EXT2_NO_MTAB_FILE doesn't obey
this rule.  So fix it.

Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Cc: Theodore Ts'o <tytso@mit.edu>
---
 lib/ext2fs/ext2_err.et.in |    2 +-
 lib/ext2fs/ismounted.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Theodore Ts'o - Sept. 9, 2013, 2:50 p.m.
On Mon, Aug 05, 2013 at 01:02:43PM +0800, Zheng Liu wrote:
> From: Zheng Liu <wenqing.lz@taobao.com>
> 
> When we define an error in lib/ext2fs/ext2_err.et.in, we will always use
> EXT2_ET_* prefix for a new error.  But EXT2_NO_MTAB_FILE doesn't obey
> this rule.  So fix it.
> 
> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
> Cc: Theodore Ts'o <tytso@mit.edu>

Thanks, applied.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/lib/ext2fs/ext2_err.et.in b/lib/ext2fs/ext2_err.et.in
index d20c6b7..de1b05b 100644
--- a/lib/ext2fs/ext2_err.et.in
+++ b/lib/ext2fs/ext2_err.et.in
@@ -416,7 +416,7 @@  ec	EXT2_ET_EXTENT_INVALID_LENGTH,
 ec	EXT2_ET_IO_CHANNEL_NO_SUPPORT_64,
 	"I/O Channel does not support 64-bit block numbers"
 
-ec	EXT2_NO_MTAB_FILE,
+ec	EXT2_ET_NO_MTAB_FILE,
 	"Can't check if filesystem is mounted due to missing mtab file"
 
 ec	EXT2_ET_CANT_USE_LEGACY_BITMAPS,
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index 6a223df..3fe5c76 100644
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -54,7 +54,7 @@  static errcode_t check_mntent_file(const char *mtab_file, const char *file,
 
 	*mount_flags = 0;
 	if ((f = setmntent (mtab_file, "r")) == NULL)
-		return (errno == ENOENT ? EXT2_NO_MTAB_FILE : errno);
+		return (errno == ENOENT ? EXT2_ET_NO_MTAB_FILE : errno);
 	if (stat(file, &st_buf) == 0) {
 		if (S_ISBLK(st_buf.st_mode)) {
 #ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */