Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bbb5726 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: introduce LEB overhead 



This is a preparational patch for the following statfs()
report fix.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 131130b9

fs/ubifs/super.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -530,6 +530,12 @@ static int init_constants_early(struct ubifs_info *c) 
	c->dead_wm = ALIGN(MIN_WRITE_SZ, c->min_io_size);

	c->dead_wm = ALIGN(MIN_WRITE_SZ, c->min_io_size);

	c->dark_wm = ALIGN(UBIFS_MAX_NODE_SZ, c->min_io_size);

	c->dark_wm = ALIGN(UBIFS_MAX_NODE_SZ, c->min_io_size);





	/*

	 * Calculate how many bytes would be wasted at the end of LEB if it was

	 * fully filled with data nodes of maximum size. This is used in

	 * calculations when reporting free space.

	 */

	c->leb_overhead = c->leb_size % UBIFS_MAX_DATA_NODE_SZ;

	return 0;

	return 0;

}

}

fs/ubifs/ubifs.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -995,6 +995,9 @@ struct ubifs_mount_opts { 
 * @max_idx_node_sz: maximum indexing node aligned on 8-bytes boundary

 * @max_idx_node_sz: maximum indexing node aligned on 8-bytes boundary

 * @max_inode_sz: maximum possible inode size in bytes

 * @max_inode_sz: maximum possible inode size in bytes

 * @max_znode_sz: size of znode in bytes

 * @max_znode_sz: size of znode in bytes

 *

 * @leb_overhead: how many bytes are wasted in an LEB when it is filled with

 *                data nodes of maximum size - used in free space reporting

 * @dead_wm: LEB dead space watermark

 * @dead_wm: LEB dead space watermark

 * @dark_wm: LEB dark space watermark

 * @dark_wm: LEB dark space watermark

 * @block_cnt: count of 4KiB blocks on the FS

 * @block_cnt: count of 4KiB blocks on the FS
@@ -1226,6 +1229,8 @@ struct ubifs_info { 
	int max_idx_node_sz;

	int max_idx_node_sz;

	long long max_inode_sz;

	long long max_inode_sz;

	int max_znode_sz;

	int max_znode_sz;



	int leb_overhead;

	int dead_wm;

	int dead_wm;

	int dark_wm;

	int dark_wm;

	int block_cnt;

	int block_cnt;