aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-05-12 14:06:02 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-05-12 14:06:02 -0400
commit9801f6461eb994e4eda29cba97f4596dffafbf32 (patch)
treee75edf27e5a3773906000998534e5c44f96d79e5
parente90c01e148b967d30caf59e76accb3a58ca6b74b (diff)
[GFS2] Remove incorrect initialisation of gh_owner
The gh_owner field shouldn't be set or reset outside the glock code. These were left over from when recursive locking was allowed. It isn't any more, so they are not needed. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/inode.c1
-rw-r--r--fs/gfs2/ops_fstype.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 0817f6ede188..5522fa747297 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -319,7 +319,6 @@ static int inode_create(struct gfs2_glock *i_gl, const struct gfs2_inum *inum,
319 if (error) 319 if (error)
320 goto fail; 320 goto fail;
321 } 321 }
322 ip->i_iopen_gh.gh_owner = NULL;
323 322
324 spin_lock(&io_gl->gl_spin); 323 spin_lock(&io_gl->gl_spin);
325 gfs2_glock_hold(i_gl); 324 gfs2_glock_hold(i_gl);
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index f252723b37da..44c64effc964 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -468,11 +468,6 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)
468 gfs2_glock_dq_uninit(&ji_gh); 468 gfs2_glock_dq_uninit(&ji_gh);
469 jindex = 0; 469 jindex = 0;
470 470
471 /* Disown my Journal glock */
472
473 sdp->sd_journal_gh.gh_owner = NULL;
474 sdp->sd_jinode_gh.gh_owner = NULL;
475
476 p = kthread_run(gfs2_recoverd, sdp, "gfs2_recoverd"); 471 p = kthread_run(gfs2_recoverd, sdp, "gfs2_recoverd");
477 error = IS_ERR(p); 472 error = IS_ERR(p);
478 if (error) { 473 if (error) {