Btrfs devel - Nov 2013 - [PATCH] btrfs-progs: mkfs: extend -O syntax to disable features

A way of disabling features that are on by default in case it''s not
wanted, eg. due to lack of support in the used kernel.

Signed-off-by: David Sterba <dsterba@suse.cz>
---
 mkfs.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mkfs.c b/mkfs.c
index cd0af9ef8b4f..f825e1b6bc2d 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1168,7 +1168,11 @@ static int parse_one_fs_feature(const char *name, u64
*flags)
 	int found = 0;
 
 	for (i = 0; i < ARRAY_SIZE(mkfs_features); i++) {
-		if (!strcmp(mkfs_features[i].name, name)) {
+		if (name[0] == ''^'' &&
+			!strcmp(mkfs_features[i].name, name + 1)) {
+			*flags &= ~ mkfs_features[i].flag;
+			found = 1;
+		} else if (!strcmp(mkfs_features[i].name, name)) {
 			*flags |= mkfs_features[i].flag;
 			found = 1;
 		}
-- 
1.8.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoting David Sterba (2013-11-14 08:30:45)
> A way of disabling features that are on by default in case it''s
not
> wanted, eg. due to lack of support in the used kernel.
> 
> Signed-off-by: David Sterba <dsterba@suse.cz>
> ---
>  mkfs.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/mkfs.c b/mkfs.c
> index cd0af9ef8b4f..f825e1b6bc2d 100644
> --- a/mkfs.c
> +++ b/mkfs.c
> @@ -1168,7 +1168,11 @@ static int parse_one_fs_feature(const char *name,
u64 *flags)
>         int found = 0;
>  
>         for (i = 0; i < ARRAY_SIZE(mkfs_features); i++) {
> -               if (!strcmp(mkfs_features[i].name, name)) {
> +               if (name[0] == ''^'' &&
> +                       !strcmp(mkfs_features[i].name, name + 1)) {
> +                       *flags &= ~ mkfs_features[i].flag;
> +                       found = 1;
> +               } else if (!strcmp(mkfs_features[i].name, name)) {
>                         *flags |= mkfs_features[i].flag;
>                         found = 1;
>                 }
Perfect, I was going to do this today so I can enable extrefs.

-chris
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Thu, Nov 14, 2013 at 08:56:13AM -0500, Chris Mason
wrote:
> Quoting David Sterba (2013-11-14 08:30:45)
> > A way of disabling features that are on by default in case
it''s not
> > wanted, eg. due to lack of support in the used kernel.
> > 
> > Signed-off-by: David Sterba <dsterba@suse.cz>
> > ---
> >  mkfs.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> > 
> > diff --git a/mkfs.c b/mkfs.c
> > index cd0af9ef8b4f..f825e1b6bc2d 100644
> > --- a/mkfs.c
> > +++ b/mkfs.c
> > @@ -1168,7 +1168,11 @@ static int parse_one_fs_feature(const char
*name, u64 *flags)
> >         int found = 0;
> >  
> >         for (i = 0; i < ARRAY_SIZE(mkfs_features); i++) {
> > -               if (!strcmp(mkfs_features[i].name, name)) {
> > +               if (name[0] == ''^'' &&
> > +                       !strcmp(mkfs_features[i].name, name + 1)) {
> > +                       *flags &= ~ mkfs_features[i].flag;
> > +                       found = 1;
> > +               } else if (!strcmp(mkfs_features[i].name, name)) {
> >                         *flags |= mkfs_features[i].flag;
> >                         found = 1;
> >                 }
> 
> Perfect, I was going to do this today so I can enable extrefs.
Just sent :)
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoting David Sterba (2013-11-14 09:14:14)
> On Thu, Nov 14, 2013 at 08:56:13AM -0500, Chris Mason wrote:
> > Quoting David Sterba (2013-11-14 08:30:45)
> > > A way of disabling features that are on by default in case
it''s not
> > > wanted, eg. due to lack of support in the used kernel.
> > > 
> > > Signed-off-by: David Sterba <dsterba@suse.cz>
> > > ---
> > >  mkfs.c | 6 +++++-
> > >  1 file changed, 5 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/mkfs.c b/mkfs.c
> > > index cd0af9ef8b4f..f825e1b6bc2d 100644
> > > --- a/mkfs.c
> > > +++ b/mkfs.c
> > > @@ -1168,7 +1168,11 @@ static int parse_one_fs_feature(const char
*name, u64 *flags)
> > >         int found = 0;
> > >  
> > >         for (i = 0; i < ARRAY_SIZE(mkfs_features); i++) {
> > > -               if (!strcmp(mkfs_features[i].name, name)) {
> > > +               if (name[0] == ''^'' &&
> > > +                       !strcmp(mkfs_features[i].name, name + 1))
{
> > > +                       *flags &= ~ mkfs_features[i].flag;
> > > +                       found = 1;
> > > +               } else if (!strcmp(mkfs_features[i].name, name))
{
> > >                         *flags |= mkfs_features[i].flag;
> > >                         found = 1;
> > >                 }
> > 
> > Perfect, I was going to do this today so I can enable extrefs.
> 
> Just sent :)
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html