diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-26 14:58:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-26 14:58:26 -0400 |
commit | 579b78a43b366d51f9c888afaf1eab1f4ea599fa (patch) | |
tree | 023e4893b71b35d312a1df18129b296934710d5c /fs/gfs2/super.c | |
parent | 5965b1f4792a1a9364b4e1ed6be8778a50eb981b (diff) |
[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.c | 6 |
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) | |||
469 | int error; | 469 | int error; |
470 | 470 | ||
471 | error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, | 471 | error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, |
472 | GL_LOCAL_EXCL | GL_NEVER_RECURSE, &t_gh); | 472 | GL_LOCAL_EXCL, &t_gh); |
473 | if (error) | 473 | if (error) |
474 | return error; | 474 | return error; |
475 | 475 | ||
@@ -530,7 +530,7 @@ int gfs2_make_fs_ro(struct gfs2_sbd *sdp) | |||
530 | gfs2_statfs_sync(sdp); | 530 | gfs2_statfs_sync(sdp); |
531 | 531 | ||
532 | error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, | 532 | error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, |
533 | GL_LOCAL_EXCL | GL_NEVER_RECURSE | GL_NOCACHE, | 533 | GL_LOCAL_EXCL | GL_NOCACHE, |
534 | &t_gh); | 534 | &t_gh); |
535 | if (error && !test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) | 535 | if (error && !test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) |
536 | return error; | 536 | return error; |
@@ -869,7 +869,7 @@ int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp, struct gfs2_holder *t_gh) | |||
869 | } | 869 | } |
870 | 870 | ||
871 | error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_DEFERRED, | 871 | error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_DEFERRED, |
872 | LM_FLAG_PRIORITY | GL_NEVER_RECURSE | GL_NOCACHE, | 872 | LM_FLAG_PRIORITY | GL_NOCACHE, |
873 | t_gh); | 873 | t_gh); |
874 | 874 | ||
875 | list_for_each_entry(jd, &sdp->sd_jindex_list, jd_list) { | 875 | list_for_each_entry(jd, &sdp->sd_jindex_list, jd_list) { |