* [Cluster-devel] [GFS2 PATCH] Unlock rindex mutex on glock error
[not found] <12861abf-0b7d-4e06-aad9-14c0bbd06422@zmail12.collab.prod.int.phx2.redhat.com>
@ 2012-02-29 20:15 ` Bob Peterson
2012-03-01 10:23 ` Steven Whitehouse
0 siblings, 1 reply; 2+ messages in thread
From: Bob Peterson @ 2012-02-29 20:15 UTC (permalink / raw)
To: cluster-devel.redhat.com
Hi,
This patch fixes an error path in function gfs2_rindex_update
that leaves the rindex mutex held.
Regards,
Bob Peterson
Red Hat File Systems
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
--
fs/gfs2/rgrp.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 1446b4e..e09370e 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -699,13 +699,14 @@ int gfs2_rindex_update(struct gfs2_sbd *sdp)
if (!gfs2_glock_is_locked_by_me(gl)) {
error = gfs2_glock_nq_init(gl, LM_ST_SHARED, 0, &ri_gh);
if (error)
- return error;
+ goto out_unlock;
unlock_required = 1;
}
if (!sdp->sd_rindex_uptodate)
error = gfs2_ri_update(ip);
if (unlock_required)
gfs2_glock_dq_uninit(&ri_gh);
+out_unlock:
mutex_unlock(&sdp->sd_rindex_mutex);
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Cluster-devel] [GFS2 PATCH] Unlock rindex mutex on glock error
2012-02-29 20:15 ` [Cluster-devel] [GFS2 PATCH] Unlock rindex mutex on glock error Bob Peterson
@ 2012-03-01 10:23 ` Steven Whitehouse
0 siblings, 0 replies; 2+ messages in thread
From: Steven Whitehouse @ 2012-03-01 10:23 UTC (permalink / raw)
To: cluster-devel.redhat.com
Hi,
Now in the -nmw git tree. Thanks,
Steve.
On Wed, 2012-02-29 at 15:15 -0500, Bob Peterson wrote:
> Hi,
>
> This patch fixes an error path in function gfs2_rindex_update
> that leaves the rindex mutex held.
>
> Regards,
>
> Bob Peterson
> Red Hat File Systems
>
> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
> --
> fs/gfs2/rgrp.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
> index 1446b4e..e09370e 100644
> --- a/fs/gfs2/rgrp.c
> +++ b/fs/gfs2/rgrp.c
> @@ -699,13 +699,14 @@ int gfs2_rindex_update(struct gfs2_sbd *sdp)
> if (!gfs2_glock_is_locked_by_me(gl)) {
> error = gfs2_glock_nq_init(gl, LM_ST_SHARED, 0, &ri_gh);
> if (error)
> - return error;
> + goto out_unlock;
> unlock_required = 1;
> }
> if (!sdp->sd_rindex_uptodate)
> error = gfs2_ri_update(ip);
> if (unlock_required)
> gfs2_glock_dq_uninit(&ri_gh);
> +out_unlock:
> mutex_unlock(&sdp->sd_rindex_mutex);
> }
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-01 10:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <12861abf-0b7d-4e06-aad9-14c0bbd06422@zmail12.collab.prod.int.phx2.redhat.com>
2012-02-29 20:15 ` [Cluster-devel] [GFS2 PATCH] Unlock rindex mutex on glock error Bob Peterson
2012-03-01 10:23 ` Steven Whitehouse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).