Commit 22b5a6c0 authored Jan 08, 2014 by Steven Whitehouse

GFS2: For exhash conversion, only one block is needed



For most cases, only a single new block is needed when we reach
the point of converting from stuffed to exhash directory. The
exception being when the file name is so long that it will not
fit within the new leaf block.

So this patch adds a simple test for that situation so that we
do not need to request the full reservation size in this case.

Potentially we could calculate more accurately the value to use
in other cases too, but that is much more complicated to do and
it is doubtful that the benefit would outweigh the extra cost
in code complexity.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

parent 62e96cf8

fs/gfs2/dir.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -2035,7 +2035,9 @@ out:
		int gfs2_diradd_alloc_required(struct inode inode, const struct qstr name,
		struct gfs2_diradd *da)
		{
		struct gfs2_inode *ip = GFS2_I(inode);
		struct gfs2_sbd *sdp = GFS2_SB(inode);
		const unsigned int extra = sizeof(struct gfs2_dinode) - sizeof(struct gfs2_leaf);
		struct gfs2_dirent *dent;
		struct buffer_head *bh;

		@@ -2046,6 +2048,9 @@ int gfs2_diradd_alloc_required(struct inode inode, const struct qstr name,
		dent = gfs2_dirent_search(inode, name, gfs2_dirent_find_space, &bh);
		if (!dent) {
		da->nr_blocks = sdp->sd_max_dirres;
		if (!(ip->i_diskflags & GFS2_DIF_EXHASH) &&
		(GFS2_DIRENT_SIZE(name->len) < extra))
		da->nr_blocks = 1;
		return 0;
		}
		if (IS_ERR(dent))

Admin message