From: Bob Peterson Date: Wed, 11 Sep 2013 18:44:05 +0000 (-0500) Subject: GFS2: Do not reset flags on active reservations X-Git-Tag: MMI-PSA29.97-13-9~13357^2~15 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b8708905199a85eebbd820f98d18e045c32077bf;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git GFS2: Do not reset flags on active reservations When we used try locks for rgrps on block allocations, it was important to clear the flags field so that we used a blocking hold on the glock. Now that we're not doing try locks, clearing flags is unnecessary, and a waste of time. In fact, it's probably doing the wrong thing because it clears the GL_SKIP bit that was set for the lvb tracking purposes. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse --- diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 7d64a27683d9..8e5003820aa7 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -1825,7 +1825,6 @@ int gfs2_inplace_reserve(struct gfs2_inode *ip, u32 requested, u32 aflags) return -EINVAL; if (gfs2_rs_active(rs)) { begin = rs->rs_rbm.rgd; - flags = 0; /* Yoda: Do or do not. There is no try */ } else if (ip->i_rgd && rgrp_contains_block(ip->i_rgd, ip->i_goal)) { rs->rs_rbm.rgd = begin = ip->i_rgd; } else {