diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2007-01-22 12:10:39 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-02-05 13:37:20 -0500 |
commit | 1c0f4872dc4bbeb2223a300517099786211fce83 (patch) | |
tree | 21e4c880e68751dabecfc0d77ff226ec6fcb6951 /fs/gfs2/glops.c | |
parent | 6bd9c8c2fb99d1f5af6201db2f063c1d754c230a (diff) | |
download | op-kernel-dev-1c0f4872dc4bbeb2223a300517099786211fce83.zip op-kernel-dev-1c0f4872dc4bbeb2223a300517099786211fce83.tar.gz |
[GFS2] Remove local exclusive glock mode
Here is a patch for GFS2 to remove the local exclusive flag. In
the places it was used, mutex's are always held earlier in the
call path, so it appears redundant in the LM_ST_SHARED case.
Also, the GFS2 holders were setting local exclusive in any case where
the requested lock was LM_ST_EXCLUSIVE. So the other places in the glock
code where the flag was tested have been replaced with tests for the
lock state being LM_ST_EXCLUSIVE in order to ensure the logic is the
same as before (i.e. LM_ST_EXCLUSIVE is always locally exclusive as well
as globally exclusive).
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/glops.c')
-rw-r--r-- | fs/gfs2/glops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index e4da26f..dda68586 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -295,7 +295,7 @@ static int inode_go_lock(struct gfs2_holder *gh) if ((ip->i_di.di_flags & GFS2_DIF_TRUNC_IN_PROG) && (gl->gl_state == LM_ST_EXCLUSIVE) && - (gh->gh_flags & GL_LOCAL_EXCL)) + (gh->gh_state == LM_ST_EXCLUSIVE)) error = gfs2_truncatei_resume(ip); return error; |