summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2013-09-11 13:44:05 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2013-09-17 10:19:29 +0100
commitb8708905199a85eebbd820f98d18e045c32077bf (patch)
tree873caed4e8b0f7dbf8d4640042b3819a6b19dc63 /fs
parent7e230f5774336c5c180d8aeab0e2cb1326c73fa3 (diff)
downloadop-kernel-dev-b8708905199a85eebbd820f98d18e045c32077bf.zip
op-kernel-dev-b8708905199a85eebbd820f98d18e045c32077bf.tar.gz
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 <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/rgrp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 7d64a27..8e50038 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 {
OpenPOWER on IntegriCloud