diff mbox

btrfs-progs: read global reserve size from space infos

Message ID 1398172800-19548-1-git-send-email-dsterba@suse.cz
State Superseded, archived
Delegated to: David Sterba
Headers show

Commit Message

David Sterba April 22, 2014, 1:20 p.m. UTC
Kernels 3.15 > export the global block reserve as a space info presented
by 'btrfs fi df' but would display 'unknown' instead of some meaningful
string.

Signed-off-by: David Sterba <dsterba@suse.cz>
---

Global_rsv or GlobalRsv or Globalrsv or something else?

 cmds-filesystem.c | 2 ++
 ctree.h           | 2 ++
 2 files changed, 4 insertions(+)

Comments

Hugo Mills April 22, 2014, 2:09 p.m. UTC | #1
On Tue, Apr 22, 2014 at 03:20:00PM +0200, David Sterba wrote:
> Kernels 3.15 > export the global block reserve as a space info presented
> by 'btrfs fi df' but would display 'unknown' instead of some meaningful
> string.
> 
> Signed-off-by: David Sterba <dsterba@suse.cz>
> ---
> 
> Global_rsv or GlobalRsv or Globalrsv or something else?

   Personally, I'd probably go for the camel case GlobalRsv, or
possibly GlbReserve. (Assuming that it's going to be only a single
token without whitespace to make parsing easier).

   Hugo.

>  cmds-filesystem.c | 2 ++
>  ctree.h           | 2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/cmds-filesystem.c b/cmds-filesystem.c
> index 306f715475ac..5a3bbca91458 100644
> --- a/cmds-filesystem.c
> +++ b/cmds-filesystem.c
> @@ -129,6 +129,8 @@ static char *group_type_str(u64 flag)
>  		return "Metadata";
>  	case BTRFS_BLOCK_GROUP_DATA|BTRFS_BLOCK_GROUP_METADATA:
>  		return "Data+Metadata";
> +	case BTRFS_SPACE_INFO_GLOBAL_RSV:
> +		return "Global_rsv";
>  	default:
>  		return "unknown";
>  	}
> diff --git a/ctree.h b/ctree.h
> index a4d2cd114614..7e8ced718931 100644
> --- a/ctree.h
> +++ b/ctree.h
> @@ -861,6 +861,8 @@ struct btrfs_csum_item {
>  /* used in struct btrfs_balance_args fields */
>  #define BTRFS_AVAIL_ALLOC_BIT_SINGLE	(1ULL << 48)
>  
> +#define BTRFS_SPACE_INFO_GLOBAL_RSV    (1ULL << 49)
> +
>  #define BTRFS_QGROUP_STATUS_OFF			0
>  #define BTRFS_QGROUP_STATUS_ON			1
>  #define BTRFS_QGROUP_STATUS_SCANNING		2
Xavier Bassery April 22, 2014, 3:12 p.m. UTC | #2
On Tue, 22 Apr 2014 15:09:00 +0100
Hugo Mills <hugo@carfax.org.uk> wrote:

> On Tue, Apr 22, 2014 at 03:20:00PM +0200, David Sterba wrote:
> > Kernels 3.15 > export the global block reserve as a space info
> > presented by 'btrfs fi df' but would display 'unknown' instead of
> > some meaningful string.
> > 
> > Signed-off-by: David Sterba <dsterba@suse.cz>
> > ---
> > 
> > Global_rsv or GlobalRsv or Globalrsv or something else?
> 
>    Personally, I'd probably go for the camel case GlobalRsv, or
> possibly GlbReserve. (Assuming that it's going to be only a single
> token without whitespace to make parsing easier).

I second the camel case (if whitespace is to be avoided) and if I may
put my two cents in, what about GlobalReserve?
As pointed by Hugo, this has the same length as Data+Metadata.

Xavier
--
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
David Sterba April 23, 2014, 1:30 p.m. UTC | #3
On Tue, Apr 22, 2014 at 05:12:34PM +0200, Xavier Bassery wrote:
> > > Global_rsv or GlobalRsv or Globalrsv or something else?
> > 
> >    Personally, I'd probably go for the camel case GlobalRsv, or
> > possibly GlbReserve. (Assuming that it's going to be only a single
> > token without whitespace to make parsing easier).
> 
> I second the camel case (if whitespace is to be avoided) and if I may
> put my two cents in, what about GlobalReserve?
> As pointed by Hugo, this has the same length as Data+Metadata.

Sounds good, thank you both for input.
--
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
Chris Mason April 23, 2014, 2:09 p.m. UTC | #4
On 04/23/2014 09:30 AM, David Sterba wrote:
> On Tue, Apr 22, 2014 at 05:12:34PM +0200, Xavier Bassery wrote:
>>>> Global_rsv or GlobalRsv or Globalrsv or something else?
>>>
>>>     Personally, I'd probably go for the camel case GlobalRsv, or
>>> possibly GlbReserve. (Assuming that it's going to be only a single
>>> token without whitespace to make parsing easier).
>>
>> I second the camel case (if whitespace is to be avoided) and if I may
>> put my two cents in, what about GlobalReserve?
>> As pointed by Hugo, this has the same length as Data+Metadata.
>
> Sounds good, thank you both for input.

GlobalReserve gets my vote too.

-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
diff mbox

Patch

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 306f715475ac..5a3bbca91458 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -129,6 +129,8 @@  static char *group_type_str(u64 flag)
 		return "Metadata";
 	case BTRFS_BLOCK_GROUP_DATA|BTRFS_BLOCK_GROUP_METADATA:
 		return "Data+Metadata";
+	case BTRFS_SPACE_INFO_GLOBAL_RSV:
+		return "Global_rsv";
 	default:
 		return "unknown";
 	}
diff --git a/ctree.h b/ctree.h
index a4d2cd114614..7e8ced718931 100644
--- a/ctree.h
+++ b/ctree.h
@@ -861,6 +861,8 @@  struct btrfs_csum_item {
 /* used in struct btrfs_balance_args fields */
 #define BTRFS_AVAIL_ALLOC_BIT_SINGLE	(1ULL << 48)
 
+#define BTRFS_SPACE_INFO_GLOBAL_RSV    (1ULL << 49)
+
 #define BTRFS_QGROUP_STATUS_OFF			0
 #define BTRFS_QGROUP_STATUS_ON			1
 #define BTRFS_QGROUP_STATUS_SCANNING		2