From patchwork Mon Aug 5 05:02:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 264572 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 10F532C0087 for ; Mon, 5 Aug 2013 15:02:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752092Ab3HEFCm (ORCPT ); Mon, 5 Aug 2013 01:02:42 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:45747 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752075Ab3HEFCl (ORCPT ); Mon, 5 Aug 2013 01:02:41 -0400 Received: by mail-pd0-f171.google.com with SMTP id bv13so2755095pdb.30 for ; Sun, 04 Aug 2013 22:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=WJzyrcHBR6R66tSOz9pO6JkhLkxY5uBsZYJxhSENh8Q=; b=wSgMfx2A/zWRREsV3ipyIpKqjE+SAVZaEl+/VcbEBdUYR/b038sIEQHrlscoB/JnwF vqvgjYJdUaW8NerX7d5F5p/g6YM2ZR71cZrN1sUFi3tDJn5UwSI6BcYLUbWfUhPJyYCn zXWMxGkhYHizvM6RHGfeAAQfxrKep2p6d0nngnN3E3YCL/oDxlBtES4PBHOPRJRRuBKU 5iGcN7rihG79/R2FLhRu3eiNdUhzgDKCkEq802fcgMlu8koOagn6htCrDz1G5zpu1cQB uwtFLsCP7Fc4kUiqqSjzczpxFleyecenNFZncd1K9S1jSfSOPeUs+p3mAIuh1lncJG9s S+Ww== X-Received: by 10.68.232.225 with SMTP id tr1mr16004512pbc.143.1375678961056; Sun, 04 Aug 2013 22:02:41 -0700 (PDT) Received: from lz-devel.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPSA id aj3sm25540953pad.8.2013.08.04.22.02.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 04 Aug 2013 22:02:40 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu , Theodore Ts'o Subject: [PATCH] libext2fs: fix a coding style for EXT2_NO_MTAB_FILE Date: Mon, 5 Aug 2013 13:02:43 +0800 Message-Id: <1375678963-7845-1-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.9.7 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu 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 Cc: Theodore Ts'o --- lib/ext2fs/ext2_err.et.in | 2 +- lib/ext2fs/ismounted.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 */