Re: [PATCH 1/2] btrfs-progs: refactor check_label()

[Jeff Liu <jeff.liu@oracle.com>]

On 01/29/2013 11:19 PM, David Sterba wrote:
> On Tue, Jan 29, 2013 at 02:24:12PM +0800, Jeff Liu wrote:
>> --- a/utils.c
>> +++ b/utils.c
>> @@ -1122,17 +1122,21 @@ char *pretty_sizes(u64 size)
>>        -1    if the label is too long
>>        -2    if the label contains an invalid character
>>   */
>> -int check_label(char *input)
>> +static int check_label(char *input)
>>  {
>>         int i;
>>         int len = strlen(input);
>>  
>> -       if (len > BTRFS_LABEL_SIZE) {
>> +       if (len > BTRFS_LABEL_SIZE - 1) {
>> +		fprintf(stderr, "ERROR: Label %s is too long (max %d)\n",
>> +			input, BTRFS_LABEL_SIZE - 1);
>>                 return -1;
>>         }
>>  
>>         for (i = 0; i < len; i++) {
>>                 if (input[i] == '/' || input[i] == '\\') {
>> +			fprintf(stderr, "ERROR: Label %s contains invalid "
>> +				"characters\n", input);
>>                         return -2;
>>                 }
> 
> Plase drop this check, see
> http://repo.or.cz/w/btrfs-progs-unstable/devel.git/commit/79e0e445fc2365e47fc7f060d5a4445d37e184b8
> (also function comment and maybe the callers)
> 
> "btrfs-progs: kill check for /'s in labels
> 
> This patch kills a check in mkfs's label stuff which doesn't allow
> labels that have /'s in them.  This causes problems for Anaconda which
> try to label volumes with their mountpoints."
> (mkfs.c)
Ok, so looks we can safely clean this routine out of the code base since
there is no other users call it if am not missing anything.

Thanks,
-Jeff