X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id p8SAvIgS103497 for ; Wed, 28 Sep 2011 05:57:18 -0500 Received: from stout.americas.sgi.com (stout.americas.sgi.com [128.162.232.50]) by relay2.corp.sgi.com (Postfix) with ESMTP id 62DFC30406A; Wed, 28 Sep 2011 03:57:15 -0700 (PDT) Received: from stout.americas.sgi.com (localhost6.localdomain6 [127.0.0.1]) by stout.americas.sgi.com (8.14.5/8.14.2) with ESMTP id p8SAvFC6008653; Wed, 28 Sep 2011 05:57:15 -0500 Received: (from aelder@localhost) by stout.americas.sgi.com (8.14.5/8.14.5/Submit) id p8SAvFGR008652; Wed, 28 Sep 2011 05:57:15 -0500 From: Alex Elder To: xfs@oss.sgi.com Cc: Alex Elder Subject: [PATCH 4/5] xfsprogs: libxcmd: move fs_device_number() up in the file Date: Wed, 28 Sep 2011 05:57:11 -0500 Message-Id: <3a3e7a98f00ba3c8971c9941b3ee7a9fc63ddf99.1317207144.git.aelder@sgi.com> X-Mailer: git-send-email 1.7.6.2 In-Reply-To: <1317207432-8464-1-git-send-email-aelder@sgi.com> References: <1317207432-8464-1-git-send-email-aelder@sgi.com> In-Reply-To: <08dbe8c3d0f49bac0c18570a68e7aa983cb4c731.1317207144.git.aelder@sgi.com> References: <08dbe8c3d0f49bac0c18570a68e7aa983cb4c731.1317207144.git.aelder@sgi.com> X-Virus-Scanned: ClamAV version 0.94.2, clamav-milter version 0.94.2 on oss.sgi.com X-Virus-Status: Clean No content change, just code movement in preparation for the next patch. Signed-off-by: Alex Elder --- libxcmd/paths.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libxcmd/paths.c b/libxcmd/paths.c index f1cd6c7..aa0aeb6 100644 --- a/libxcmd/paths.c +++ b/libxcmd/paths.c @@ -37,6 +37,20 @@ struct fs_path *fs_path; char *mtab_file; #define PROC_MOUNTS "/proc/self/mounts" +static char * +fs_device_number( + char *name, + dev_t *devnum) +{ + struct stat64 sbuf; + + if (stat64(name, &sbuf) < 0) + return NULL; + *devnum = sbuf.st_dev; + + return name; +} + /* * Find the FS table entry for the given path. The "flags" argument * is a mask containing FS_MOUNT_POINT or FS_PROJECT_PATH (or both) @@ -73,20 +87,6 @@ fs_table_lookup( return NULL; } -static char * -fs_device_number( - char *name, - dev_t *devnum) -{ - struct stat64 sbuf; - - if (stat64(name, &sbuf) < 0) - return NULL; - *devnum = sbuf.st_dev; - - return name; -} - static int fs_table_insert( char *dir, -- 1.7.6.2