Re: [PATCH 5/8] Return the fsid from make_btrfs()

[Goffredo Baroncelli <kreijack@gmail.com>]

On 12/25/2014 03:44 AM, Satoru Takeuchi wrote:
> On 2014/12/18 5:14, Goffredo Baroncelli wrote:
>> The function make_btrfs() has as argument the fsid of the filesystem.
>> If this fsid is empty or null make_btrfs() generates a new fsid. However
>> If the buffer is valid (but the string is empty) the generated fsid is
>> copied back to the caller.
> 
> The code is goods. However, I have a comment to the description.
> 
> In this case, describing the purpose of this patch is better.
> I consider your purpose is to use fs_uuid after make_btrfs()
> when user doesn't passed -U option.
> 
> Anyway,
> 
> Reviewed-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
> 
> Thanks,
> Satoru


Many thanks Satoru,

BR
G.Baroncelli

> 
>>
>> Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it>
>> ---
>>   mkfs.c  | 7 ++++---
>>   utils.c | 7 ++++++-
>>   2 files changed, 10 insertions(+), 4 deletions(-)
>>
>> diff --git a/mkfs.c b/mkfs.c
>> index 042d12e..70c88ea 100644
>> --- a/mkfs.c
>> +++ b/mkfs.c
>> @@ -1281,7 +1281,7 @@ int main(int ac, char **av)
>>   	int dev_cnt = 0;
>>   	int saved_optind;
>>   	char estr[100];
>> -	char *fs_uuid = NULL;
>> +	char fs_uuid[BTRFS_UUID_UNPARSED_SIZE] = { 0 };
>>   	u64 features = DEFAULT_MKFS_FEATURES;
>>   
>>   	while(1) {
>> @@ -1356,7 +1356,8 @@ int main(int ac, char **av)
>>   				source_dir_set = 1;
>>   				break;
>>   			case 'U':
>> -				fs_uuid = optarg;
>> +				strncpy(fs_uuid,optarg,
>> +					BTRFS_UUID_UNPARSED_SIZE - 1);
>>   				break;
>>   			case 'K':
>>   				discard = 0;
>> @@ -1387,7 +1388,7 @@ int main(int ac, char **av)
>>   		exit(1);
>>   	}
>>   
>> -	if (fs_uuid) {
>> +	if (*fs_uuid) {
>>   		uuid_t dummy_uuid;
>>   
>>   		if (uuid_parse(fs_uuid, dummy_uuid) != 0) {
>> diff --git a/utils.c b/utils.c
>> index 3f50e4d..c7f1b2f 100644
>> --- a/utils.c
>> +++ b/utils.c
>> @@ -203,7 +203,7 @@ int make_btrfs(int fd, const char *device, const char *label, char *fs_uuid,
>>   	memset(&super, 0, sizeof(super));
>>   
>>   	num_bytes = (num_bytes / sectorsize) * sectorsize;
>> -	if (fs_uuid) {
>> +	if (fs_uuid && *fs_uuid) {
>>   		if (uuid_parse(fs_uuid, super.fsid) != 0) {
>>   			fprintf(stderr, "could not parse UUID: %s\n", fs_uuid);
>>   			ret = -EINVAL;
>> @@ -216,6 +216,11 @@ int make_btrfs(int fd, const char *device, const char *label, char *fs_uuid,
>>   		}
>>   	} else {
>>   		uuid_generate(super.fsid);
>> +		/*
>> +		 * if the fs_uuid is a valid pointer, return the generated uuid
>> +		 */
>> +		if (fs_uuid)
>> +			uuid_unparse(super.fsid, fs_uuid);
>>   	}
>>   	uuid_generate(super.dev_item.uuid);
>>   	uuid_generate(chunk_tree_uuid);
>>
> 
> 


-- 
gpg @keyserver.linux.it: Goffredo Baroncelli <kreijackATinwind.it>
Key fingerprint BBF5 1610 0B64 DAC6 5F7D  17B2 0EDA 9B37 8B82 E0B5