diff options
author | Bob Peterson <rpeterso@redhat.com> | 2013-09-11 14:44:05 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2013-09-17 05:19:29 -0400 |
commit | b8708905199a85eebbd820f98d18e045c32077bf (patch) | |
tree | 873caed4e8b0f7dbf8d4640042b3819a6b19dc63 /fs/gfs2 | |
parent | 7e230f5774336c5c180d8aeab0e2cb1326c73fa3 (diff) |
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/gfs2')
-rw-r--r-- | fs/gfs2/rgrp.c | 1 |
1 files changed, 0 insertions, 1 deletions
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) | |||
1825 | return -EINVAL; | 1825 | return -EINVAL; |
1826 | if (gfs2_rs_active(rs)) { | 1826 | if (gfs2_rs_active(rs)) { |
1827 | begin = rs->rs_rbm.rgd; | 1827 | begin = rs->rs_rbm.rgd; |
1828 | flags = 0; /* Yoda: Do or do not. There is no try */ | ||
1829 | } else if (ip->i_rgd && rgrp_contains_block(ip->i_rgd, ip->i_goal)) { | 1828 | } else if (ip->i_rgd && rgrp_contains_block(ip->i_rgd, ip->i_goal)) { |
1830 | rs->rs_rbm.rgd = begin = ip->i_rgd; | 1829 | rs->rs_rbm.rgd = begin = ip->i_rgd; |
1831 | } else { | 1830 | } else { |