lkml.org 
[lkml]   [2015]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 12/15] tools lib api: Add configured support for fs
Em Wed, Sep 02, 2015 at 10:39:31AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Wed, Sep 02, 2015 at 09:56:42AM +0200, Jiri Olsa escreveu:
> > Adding name__mount (where name is in sysfs,procfs,debugfs,tracefs)
> > interface that returns bool state of the filesystem mount:
> > true - mounted, false - not mounted
>
> Well, why not take the opportunity and call it... name__mounted()?
> "__configured()" is too vague...
>
> Also there was some cut'n'pasting mistake here... if you agree I can fix
> it all up and make this change, well, I'm doing it on my local tree,
> holler if you have any objection :)
>
> - Arnaldo
>
> > It will not try to mount the filesystem.
>
> No FSTYPE__configured() (to-be FSTYPE__mounted()) doesn't mount
> anything, that is what FSTYPE__mount() does :-)

Argh, now it was me confused, right, __configured() or __mounted()
doesn'try to mount anything, as you said, it is just the "Adding
name__mount() that in the beginning that needs fixing, the rest of my
comment stands.

- Arnaldo

>
> - Arnaldo
>
> > Link: http://lkml.kernel.org/n/tip-csvlq2hr43ys3u7nfs2up9y9@git.kernel.org
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> > tools/lib/api/fs/fs.c | 23 ++++++++++++++---------
> > tools/lib/api/fs/fs.h | 5 ++++-
> > 2 files changed, 18 insertions(+), 10 deletions(-)
> >
> > diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c
> > index bc93baf33fff..8afe08a99bc6 100644
> > --- a/tools/lib/api/fs/fs.c
> > +++ b/tools/lib/api/fs/fs.c
> > @@ -244,15 +244,20 @@ static const char *fs__mount(int idx)
> > return fs__check_mounts(fs) ? fs->path : NULL;
> > }
> >
> > -#define FS(name, idx) \
> > -const char *name##__mountpoint(void) \
> > -{ \
> > - return fs__mountpoint(idx); \
> > -} \
> > - \
> > -const char *name##__mount(void) \
> > -{ \
> > - return fs__mount(idx); \
> > +#define FS(name, idx) \
> > +const char *name##__mountpoint(void) \
> > +{ \
> > + return fs__mountpoint(idx); \
> > +} \
> > + \
> > +const char *name##__mount(void) \
> > +{ \
> > + return fs__mount(idx); \
> > +} \
> > + \
> > +bool name##__configured(void) \
> > +{ \
> > + return name##__mountpoint() != NULL; \
> > }
> >
> > FS(sysfs, FS__SYSFS);
> > diff --git a/tools/lib/api/fs/fs.h b/tools/lib/api/fs/fs.h
> > index a9627ea5e6ae..f654bcb99d1e 100644
> > --- a/tools/lib/api/fs/fs.h
> > +++ b/tools/lib/api/fs/fs.h
> > @@ -1,6 +1,8 @@
> > #ifndef __API_FS__
> > #define __API_FS__
> >
> > +#include <stdbool.h>
> > +
> > /*
> > * On most systems <limits.h> would have given us this, but not on some systems
> > * (e.g. GNU/Hurd).
> > @@ -11,7 +13,8 @@
> >
> > #define FS(name) \
> > const char *name##__mountpoint(void); \
> > - const char *name##__mount(void);
> > + const char *name##__mount(void); \
> > + bool name##__configured(void); \
> >
> > FS(sysfs)
> > FS(procfs)
> > --
> > 2.4.3


\
 
 \ /
  Last update: 2015-09-02 16:01    [W:0.090 / U:0.224 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site