Commit 9e73f571 authored Feb 17, 2012 by Bob Peterson Committed by Steven Whitehouse Feb 28, 2012

GFS2: Ensure rindex is uptodate for fallocate

This patch fixes a problem whereby gfs2_grow was failing and causing GFS2
to assert. The problem was that when GFS2's fallocate operation tried to
acquire an "allocation" it made sure the rindex was up to date, and if not,
it called gfs2_rindex_update. However, if the file being fallocated was
the rindex itself, it was already locked at that point. By calling
gfs2_rindex_update at an earlier point in time, we bring rindex up to date
and thereby avoid trying to lock it when the "allocation" is acquired.

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

parent 718b97bd

fs/gfs2/file.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -772,6 +772,11 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset,
	if (bytes == 0)		if (bytes == 0)
	bytes = sdp->sd_sb.sb_bsize;		bytes = sdp->sd_sb.sb_bsize;

			error = gfs2_rindex_update(sdp);
			if (error) {
			fs_warn(sdp, "rindex update returns %d\n", error);
			return error;
			}
	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &ip->i_gh);		gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &ip->i_gh);
	error = gfs2_glock_nq(&ip->i_gh);		error = gfs2_glock_nq(&ip->i_gh);
	if (unlikely(error))		if (unlikely(error))

Admin message