summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/super.c
diff options
context:
space:
mode:
authorSteven Whitehouse2006-04-26 20:58:26 +0200
committerSteven Whitehouse2006-04-26 20:58:26 +0200
commit579b78a43b366d51f9c888afaf1eab1f4ea599fa (patch)
tree023e4893b71b35d312a1df18129b296934710d5c /fs/gfs2/super.c
parent[GFS2] Don't do recursive locking in glock layer (diff)
downloadkernel-qcow2-linux-579b78a43b366d51f9c888afaf1eab1f4ea599fa.tar.gz
kernel-qcow2-linux-579b78a43b366d51f9c888afaf1eab1f4ea599fa.tar.xz
kernel-qcow2-linux-579b78a43b366d51f9c888afaf1eab1f4ea599fa.zip
[GFS2] Remove GL_NEVER_RECURSE flag
There is no point in keeping this flag since recursion is not now allowed for any glock. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r--fs/gfs2/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index a4da649d086f..f0dbd2d7aadc 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -469,7 +469,7 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)
int error;
error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED,
- GL_LOCAL_EXCL | GL_NEVER_RECURSE, &t_gh);
+ GL_LOCAL_EXCL, &t_gh);
if (error)
return error;
@@ -530,7 +530,7 @@ int gfs2_make_fs_ro(struct gfs2_sbd *sdp)
gfs2_statfs_sync(sdp);
error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED,
- GL_LOCAL_EXCL | GL_NEVER_RECURSE | GL_NOCACHE,
+ GL_LOCAL_EXCL | GL_NOCACHE,
&t_gh);
if (error && !test_bit(SDF_SHUTDOWN, &sdp->sd_flags))
return error;
@@ -869,7 +869,7 @@ int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp, struct gfs2_holder *t_gh)
}
error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_DEFERRED,
- LM_FLAG_PRIORITY | GL_NEVER_RECURSE | GL_NOCACHE,
+ LM_FLAG_PRIORITY | GL_NOCACHE,
t_gh);
list_for_each_entry(jd, &sdp->sd_jindex_list, jd_list) {