>From 8a74a33fecdf651e02efb705adef2d93dc7752e8 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[EMAIL PROTECTED]>
Date: Wed, 1 Aug 2007 11:08:29 +0100
Subject: [PATCH] [GFS2] Remove unused HIF_ABORTED flag
We never try to wait for a gfs2_holder which has returned -EINVAL
when initially queued, so that the HIF_ABORTED flag is not needed.
Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index fd8cf02..5e2c269 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -881,9 +881,6 @@ static int glock_wait_internal(struct gfs2_holder *gh)
struct gfs2_glock *gl = gh->gh_gl;
struct gfs2_sbd *sdp = gl->gl_sbd;
- if (test_bit(HIF_ABORTED, &gh->gh_iflags))
- return -EIO;
-
if (gh->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)) {
spin_lock(&gl->gl_spin);
if (gl->gl_req_gh != gh &&
@@ -996,10 +993,8 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
int error = 0;
restart:
- if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) {
- set_bit(HIF_ABORTED, &gh->gh_iflags);
+ if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
return -EIO;
- }
spin_lock(&gl->gl_spin);
add_to_queue(gh);
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 1d90ff1..cc5ca58 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -135,7 +135,6 @@ enum {
/* States */
HIF_HOLDER = 6,
- HIF_ABORTED = 9,
HIF_WAIT = 10,
};
--
1.5.1.2
