Commit a6645745 authored by Bob Peterson's avatar Bob Peterson Committed by Andreas Gruenbacher
Browse files

gfs2: simplify gfs2_block_map 



Function gfs2_block_map had a lot of redundancy between its create and
no_create paths. This patch simplifies the code to eliminate the redundancy.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 6302d6f4

fs/gfs2/bmap.c

+5 −9
Original line number Diff line number Diff line
@@ -1292,6 +1292,7 @@ int gfs2_block_map(struct inode *inode, sector_t lblock, 
	loff_t length = bh_map->b_size;

	struct metapath mp = { .mp_aheight = 1, };

	struct iomap iomap = { };

	int flags = create ? IOMAP_WRITE : 0;

	int ret;



	clear_buffer_mapped(bh_map);
@@ -1299,15 +1300,10 @@ int gfs2_block_map(struct inode *inode, sector_t lblock, 
	clear_buffer_boundary(bh_map);

	trace_gfs2_bmap(ip, bh_map, lblock, create, 1);



	if (create) {

		ret = gfs2_iomap_get(inode, pos, length, IOMAP_WRITE, &iomap, &mp);

		if (!ret && iomap.type == IOMAP_HOLE)

	ret = gfs2_iomap_get(inode, pos, length, flags, &iomap, &mp);

	if (create && !ret && iomap.type == IOMAP_HOLE)

		ret = gfs2_iomap_alloc(inode, &iomap, &mp);

	release_metapath(&mp);

	} else {

		ret = gfs2_iomap_get(inode, pos, length, 0, &iomap, &mp);

		release_metapath(&mp);

	}

	if (ret)

		goto out;