public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Steven Whitehouse <swhiteho@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - gfs2_tool: Remove code to read args/* Date: Wed, 27 May 2009 10:20:00 -0000 [thread overview] Message-ID: <20090527101952.25CB9120356@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=112984a41fd02ae4233ac7e7245d681d13557c87 Commit: 112984a41fd02ae4233ac7e7245d681d13557c87 Parent: e8fa52a646ff06f1dfed806d73086162e6a999ca Author: Steven Whitehouse <swhiteho@redhat.com> AuthorDate: Tue May 26 10:26:28 2009 +0100 Committer: Steven Whitehouse <swhiteho@redhat.com> CommitterDate: Wed May 27 10:07:45 2009 +0100 gfs2_tool: Remove code to read args/* Nobody has replied to my message about removing the printing of the args parameters in the df subcommand of gfs2_tool. In any case, all the information is available via /proc/mounts and that will actually be both correct and complete unlike that in the args subdirectory of gfs2's sysfs. In addition there is really no need to list this information during df since its not likely to be of any interest to someone who is only interested in knowing how full their filesystem is. Also there was an error which has been around for some time in the df subcommand which I fixed in a previous patch. The fact that nobody had reported that in the time it existed (probably several years) means that I'm rather doubtful that anybody is using this tool anyway. So the easiest solution seems to be removing the extra lines of output. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> --- gfs2/tool/df.c | 31 +------------------------------ 1 files changed, 1 insertions(+), 30 deletions(-) diff --git a/gfs2/tool/df.c b/gfs2/tool/df.c index 07c7c59..3a5ec98 100644 --- a/gfs2/tool/df.c +++ b/gfs2/tool/df.c @@ -79,8 +79,7 @@ do_df_one(char *path) unsigned int percentage; unsigned int journals; uint64_t rgrps; - unsigned int flags; - char *value, *fs; + char *fs; int statfs_fd; struct gfs2_sbd sbd; char buf[GFS2_DEFAULT_BSIZE], statfs_fn[PATH_MAX]; @@ -157,36 +156,8 @@ do_df_one(char *path) printf( _(" Block size = %u\n"), sbd.sd_sb.sb_bsize); printf( _(" Journals = %u\n"), journals); printf( _(" Resource Groups = %"PRIu64"\n"), rgrps); - value = get_sysfs(fs, "args/lockproto"); - if (value) - printf( _(" Mounted lock proto = \"%s\"\n"), - value[0] ? value : sbd.sd_sb.sb_lockproto); - else - printf( _(" Mounted lock proto = (Not found: %s)\n"), - strerror(errno)); - - value = get_sysfs(fs, "args/locktable"); - if (value) - printf( _(" Mounted lock table = \"%s\"\n"), - value[0] ? value : sbd.sd_sb.sb_locktable); - else - printf( _(" Mounted lock table = (Not found: %s)\n"), - strerror(errno)); - - printf( _(" Mounted host data = \"%s\"\n"), - get_sysfs(fs, "args/hostdata")); printf( _(" Journal number = %s\n"), get_sysfs(fs, "lock_module/jid")); - if (get_sysfs_uint(fs, "args/localflocks", &flags)) - printf( _(" Lock flocks = (Not found: %s)\n"), strerror(errno)); - else - printf( _(" Local flocks = %s\n"), flags ? "TRUE" : "FALSE"); - - if (get_sysfs_uint(fs, "args/localcaching", &flags)) - printf( _(" Lock caching = (Not found: %s)\n"), strerror(errno)); - else - printf( _(" Local caching = %s\n"), flags ? "TRUE" : "FALSE"); - /* Read the master statfs file */ if (mount_gfs2_meta(&sbd)) { fprintf(stderr, _("Error mounting GFS2 metafs: %s\n"),
reply other threads:[~2009-05-27 10:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090527101952.25CB9120356@lists.fedorahosted.org \ --to=swhiteho@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).