Re: [PATCH v2 1/2] btrfs-progs: limit the max value of leafsize and nodesize

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Sep 28, 2012 at 11:02:39AM +0800, Robin Dong wrote:
> From: Robin Dong <sanbai@xxxxxxxxxx>
> --- a/mkfs.c
> +++ b/mkfs.c
> @@ -1201,6 +1201,27 @@ static int zero_output_file(int out_fd, u64 size, u32 sectorsize)
>  	return ret;
>  }
>  
> +static int check_leaf_or_node_size(u32 size, u32 sectorsize)
> +{
> +	if (size < sectorsize) {
> +		fprintf(stderr,
> +			"Illegal leafsize (or nodesize) %u (smaller than %u)\n",
> +			size, sectorsize);

First looking at the message, the absolute limit value might be
confusing, the condition is really 'if node/leaf is smaller than
sectorsize', and sectorsize will become a varaible eventually (though
now it's fixed to the system's PAGE_SIZE and 4k in most cases).

So, even if this will make the erro message more verbose, I suggest to
enhance the explanation with

"... (smaller than sectorsize %u)"

(If you se a better way how to format the value and the word, please don't
hasitate to change it.)

> +		return -1;
> +	} else if (size > BTRFS_MAX_METADATA_BLOCKSIZE) {
> +		fprintf(stderr,
> +			"Illegal leafsize (or nodesize) %u (larger than %u)\n",
> +			size, BTRFS_MAX_METADATA_BLOCKSIZE);
> +		return -1;
> +	} else if (size & (sectorsize - 1)) {
> +		fprintf(stderr,
> +			"Illegal leafsize (or nodesize) %u (not align to %u)\n",

align -> aligned

> +			size, sectorsize);
> +		return -1;
> +	}
> +	return 0;
> +}
> +

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


[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux