FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 03-19-2009, 02:30 PM
Andrew Price
 
Default libgfs2: Remove 'die' calls from __get_sysfs

This patch removes the calls to die from __get_sysfs and adds error
handling to it and its callers. To enable this, the prototype of
get_sysfs_uint had to be changed so that error status can be returned.
Callers to get_sysfs and get_sysfs_uint are also updated to handle error
cases where appropriate.

Signed-off-by: Andrew Price <andy@andrewprice.me.uk>
---
gfs2/libgfs2/libgfs2.h | 2 +-
gfs2/libgfs2/misc.c | 39 ++++++++++++++++++++++++++++++---------
gfs2/tool/df.c | 42 +++++++++++++++++++++++++++++-------------
gfs2/tool/tune.c | 9 +++++++--
4 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 2e79ad4..d8faf45 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -634,7 +634,7 @@ extern char *find_debugfs_mount(void);
extern char *mp2fsname(char *mp);
extern char *mp2fsname2(char *devname);
extern char *get_sysfs(char *fsname, char *filename);
-extern unsigned int get_sysfs_uint(char *fsname, char *filename);
+extern int get_sysfs_uint(char *fsname, char *filename, unsigned int *val);
extern int set_sysfs(char *fsname, char *filename, char *val);
extern int is_fsname(char *name);

diff --git a/gfs2/libgfs2/misc.c b/gfs2/libgfs2/misc.c
index 320ce84..0e7a2b7 100644
--- a/gfs2/libgfs2/misc.c
+++ b/gfs2/libgfs2/misc.c
@@ -216,10 +216,10 @@ static char *__get_sysfs(char *fsname, char *filename)

fd = open(path, O_RDONLY);
if (fd < 0)
- die("can't open %s: %s
", path, strerror(errno));
+ return NULL;
rv = read(fd, sysfs_buf, PAGE_SIZE);
if (rv < 0)
- die("can't read from %s: %s
", path, strerror(errno));
+ return NULL;

close(fd);
return sysfs_buf;
@@ -227,17 +227,30 @@ static char *__get_sysfs(char *fsname, char *filename)

char *get_sysfs(char *fsname, char *filename)
{
- char *p = strchr(__get_sysfs(fsname, filename), '
');
+ char *s;
+ char *p;
+
+ s = __get_sysfs(fsname, filename);
+ if (!s)
+ return NULL;
+ p = strchr(s, '
');
if (p)
*p = '';
return sysfs_buf;
}

-unsigned int get_sysfs_uint(char *fsname, char *filename)
+int get_sysfs_uint(char *fsname, char *filename, unsigned int *val)
{
- unsigned int x;
- sscanf(__get_sysfs(fsname, filename), "%u", &x);
- return x;
+ char *s = __get_sysfs(fsname, filename);
+ int ret;
+ if (!s)
+ return -1;
+ ret = sscanf(s, "%u", val);
+ if (1 != ret) {
+ errno = ENOMSG;
+ return -1;
+ }
+ return 0;
}

int set_sysfs(char *fsname, char *filename, char *val)
@@ -313,6 +326,7 @@ mp2fsname2(char *mp)
char buffer[PATH_MAX], device_name[PATH_MAX];
int fsdump, fspass, ret, found = 0;
char fspath[PATH_MAX], fsoptions[PATH_MAX], fstype[80];
+ char *id;

/* Take care of trailing '/' */
if (mp[strlen(mp) - 1] == '/')
@@ -361,7 +375,10 @@ mp2fsname2(char *mp)
if (de->d_name[0] == '.')
continue;

- if (strcmp(get_sysfs(de->d_name, "id"), device_id) == 0) {
+ id = get_sysfs(de->d_name, "id");
+ if (!id)
+ continue;
+ if (strcmp(id, device_id) == 0) {
fsname = strdup(de->d_name);
break;
}
@@ -399,6 +416,7 @@ char *mp2fsname(char *mp)
struct stat statbuf;
DIR *d;
struct dirent *de;
+ char *id;

if (stat(mp, &statbuf))
return NULL;
@@ -415,7 +433,10 @@ char *mp2fsname(char *mp)
if (de->d_name[0] == '.')
continue;

- if (strcmp(get_sysfs(de->d_name, "id"), device_id) == 0) {
+ id = get_sysfs(de->d_name, "id");
+ if (!id)
+ continue;
+ if (strcmp(id, device_id) == 0) {
fsname = strdup(de->d_name);
break;
}
diff --git a/gfs2/tool/df.c b/gfs2/tool/df.c
index 7d2875d..f36648b 100644
--- a/gfs2/tool/df.c
+++ b/gfs2/tool/df.c
@@ -147,22 +147,38 @@ do_df_one(char *path)
printf(" Block size = %u
", sbd.sd_sb.sb_bsize);
printf(" Journals = %u
", journals);
printf(" Resource Groups = %"PRIu64"
", rgrps);
- printf(" Mounted lock proto = "%s"
",
- ((value = get_sysfs(fs, "args/lockproto"))[0])
- ? value : sbd.sd_sb.sb_lockproto);
- printf(" Mounted lock table = "%s"
",
- ((value = get_sysfs(fs, "args/locktable"))[0])
- ? value : sbd.sd_sb.sb_locktable);
+ if ((value = get_sysfs(fs, "args/lockproto")))
+ printf(" Mounted lock proto = "%s"
",
+ value[0] ? value : sbd.sd_sb.sb_lockproto);
+ else
+ printf(" Mounted lock proto = (Not found: %s)
",
+ strerror(errno));
+
+ if ((value = get_sysfs(fs, "args/locktable")))
+ printf(" Mounted lock table = "%s"
",
+ value[0] ? value : sbd.sd_sb.sb_locktable);
+ else
+ printf(" Mounted lock table = (Not found: %s)
",
+ strerror(errno));
+
printf(" Mounted host data = "%s"
",
get_sysfs(fs, "args/hostdata"));
printf(" Journal number = %s
", get_sysfs(fs, "lockstruct/jid"));
- flags = get_sysfs_uint(fs, "lockstruct/flags");
- printf(" Lock module flags = %x", flags);
- printf("
");
- printf(" Local flocks = %s
",
- (get_sysfs_uint(fs, "args/localflocks")) ? "TRUE" : "FALSE");
- printf(" Local caching = %s
",
- (get_sysfs_uint(fs, "args/localcaching")) ? "TRUE" : "FALSE");
+
+ if (get_sysfs_uint(fs, "lockstruct/flags", &flags))
+ printf(" Lock module flags = (Not found: %s)
", strerror(errno));
+ else
+ printf(" Lock module flags = %x
", flags);
+
+ if (get_sysfs_uint(fs, "args/localflocks", &flags))
+ printf(" Lock flocks = (Not found: %s)
", strerror(errno));
+ else
+ printf(" Local flocks = %s
", flags ? "TRUE" : "FALSE");
+
+ if (get_sysfs_uint(fs, "args/localcaching", &flags))
+ printf(" Lock caching = (Not found: %s)
", strerror(errno));
+ else
+ printf(" Local caching = %s
", flags ? "TRUE" : "FALSE");

/* Read the master statfs file */
if (mount_gfs2_meta(&sbd)) {
diff --git a/gfs2/tool/tune.c b/gfs2/tool/tune.c
index b4b24d8..28b7e8b 100644
--- a/gfs2/tool/tune.c
+++ b/gfs2/tool/tune.c
@@ -39,6 +39,7 @@ get_tune(int argc, char **argv)
double ratio;
unsigned int num, den;
struct gfs2_sbd sbd;
+ char *value;

if (optind == argc)
die("Usage: gfs2_tool gettune <mountpoint>
");
@@ -65,8 +66,12 @@ get_tune(int argc, char **argv)
continue;
snprintf(path, PATH_MAX - 1, "tune/%s", de->d_name);
if (strcmp(de->d_name, "quota_scale") == 0) {
- sscanf(get_sysfs(fs, "tune/quota_scale"), "%u %u",
- &num, &den);
+ if (!(value = get_sysfs(fs, "tune/quota_scale"))) {
+ printf("quota_scale = (Not found: %s)
",
+ strerror(errno));
+ continue;
+ }
+ sscanf(value, "%u %u", &num, &den);
ratio = (double)num / den;
printf("quota_scale = %.4f (%u, %u)
", ratio, num,
den);
--
1.6.2
 

Thread Tools




All times are GMT. The time now is 01:00 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org