Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 38673
b: refs/heads/master
c: 3632752
h: refs/heads/master
i:
  38671: 9b99f83
v: v3
  • Loading branch information
Steven Whitehouse committed Apr 28, 2006
1 parent b5877ab commit f244d3b
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 55 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d26046bb0aff707aac38a9bf3dd56fa39b28a399
refs/heads/master: 363275216c1a1b0b82c8419310c194b8c26b9c27
6 changes: 3 additions & 3 deletions trunk/fs/gfs2/glock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1814,7 +1814,7 @@ void gfs2_try_toss_inode(struct gfs2_sbd *sdp, struct gfs2_inum *inum)
if (atomic_read(&ip->i_count))
goto out_unlock;

gfs2_inode_destroy(ip);
gfs2_inode_destroy(ip, 1);

out_unlock:
gfs2_glmutex_unlock(gl);
Expand Down Expand Up @@ -1940,7 +1940,7 @@ void gfs2_reclaim_glock(struct gfs2_sbd *sdp)
if (gl->gl_ops == &gfs2_inode_glops) {
struct gfs2_inode *ip = gl->gl_object;
if (ip && !atomic_read(&ip->i_count))
gfs2_inode_destroy(ip);
gfs2_inode_destroy(ip, 1);
}
if (queue_empty(gl, &gl->gl_holders) &&
gl->gl_state != LM_ST_UNLOCKED &&
Expand Down Expand Up @@ -2083,7 +2083,7 @@ static void clear_glock(struct gfs2_glock *gl)
if (gl->gl_ops == &gfs2_inode_glops) {
struct gfs2_inode *ip = gl->gl_object;
if (ip && !atomic_read(&ip->i_count))
gfs2_inode_destroy(ip);
gfs2_inode_destroy(ip, 1);
}
if (queue_empty(gl, &gl->gl_holders) &&
gl->gl_state != LM_ST_UNLOCKED)
Expand Down
95 changes: 45 additions & 50 deletions trunk/fs/gfs2/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip)

static int inode_create(struct gfs2_glock *i_gl, const struct gfs2_inum *inum,
struct gfs2_glock *io_gl, unsigned int io_state,
struct gfs2_inode **ipp)
struct gfs2_inode **ipp, int need_lock)
{
struct gfs2_sbd *sdp = i_gl->gl_sbd;
struct gfs2_inode *ip;
Expand All @@ -312,11 +312,13 @@ static int inode_create(struct gfs2_glock *i_gl, const struct gfs2_inum *inum,

ip->i_greedy = gfs2_tune_get(sdp, gt_greedy_default);

error = gfs2_glock_nq_init(io_gl,
io_state, GL_LOCAL_EXCL | GL_EXACT,
&ip->i_iopen_gh);
if (error)
goto fail;
if (need_lock) {
error = gfs2_glock_nq_init(io_gl,
io_state, GL_LOCAL_EXCL | GL_EXACT,
&ip->i_iopen_gh);
if (error)
goto fail;
}
ip->i_iopen_gh.gh_owner = NULL;

spin_lock(&io_gl->gl_spin);
Expand Down Expand Up @@ -376,7 +378,7 @@ int gfs2_inode_get(struct gfs2_glock *i_gl, const struct gfs2_inum *inum,
error = gfs2_glock_get(sdp, inum->no_addr, &gfs2_iopen_glops,
CREATE, &io_gl);
if (!error) {
error = inode_create(i_gl, inum, io_gl, LM_ST_SHARED, ipp);
error = inode_create(i_gl, inum, io_gl, LM_ST_SHARED, ipp, 1);
gfs2_glock_put(io_gl);
}

Expand All @@ -398,21 +400,23 @@ void gfs2_inode_put(struct gfs2_inode *ip)
atomic_dec(&ip->i_count);
}

void gfs2_inode_destroy(struct gfs2_inode *ip)
void gfs2_inode_destroy(struct gfs2_inode *ip, int unlock)
{
struct gfs2_sbd *sdp = ip->i_sbd;
struct gfs2_glock *io_gl = ip->i_iopen_gh.gh_gl;
struct gfs2_glock *i_gl = ip->i_gl;

gfs2_assert_warn(sdp, !atomic_read(&ip->i_count));
gfs2_assert(sdp, io_gl->gl_object == i_gl);

spin_lock(&io_gl->gl_spin);
io_gl->gl_object = NULL;
spin_unlock(&io_gl->gl_spin);
gfs2_glock_put(i_gl);

gfs2_glock_dq_uninit(&ip->i_iopen_gh);
if (unlock) {
struct gfs2_glock *io_gl = ip->i_iopen_gh.gh_gl;
gfs2_assert(sdp, io_gl->gl_object == i_gl);

spin_lock(&io_gl->gl_spin);
io_gl->gl_object = NULL;
spin_unlock(&io_gl->gl_spin);
gfs2_glock_put(i_gl);

gfs2_glock_dq_uninit(&ip->i_iopen_gh);
}

gfs2_meta_cache_flush(ip);
kmem_cache_free(gfs2_inode_cachep, ip);
Expand Down Expand Up @@ -493,6 +497,13 @@ static int dinode_dealloc(struct gfs2_inode *ip, struct gfs2_unlinked *ul)
* @inum: the inode number to deallocate
* @io_gh: a holder for the iopen glock for this inode
*
* N.B. When we enter this we already hold the iopen glock and getting
* the glock for the inode means that we are grabbing the locks in the
* "wrong" order so we must only so a try lock operation and fail if we
* don't get the lock. Thats ok, since if we fail it means someone else
* is using the inode still and thus we shouldn't be deallocating it
* anyway.
*
* Returns: errno
*/

Expand All @@ -503,33 +514,21 @@ static int inode_dealloc(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul,
struct gfs2_holder i_gh;
int error;

error = gfs2_glock_nq_num(sdp,
ul->ul_ut.ut_inum.no_addr, &gfs2_inode_glops,
LM_ST_EXCLUSIVE, 0, &i_gh);
if (error)
return error;

/* We reacquire the iopen lock here to avoid a race with the NFS server
calling gfs2_read_inode() with the inode number of a inode we're in
the process of deallocating. And we can't keep our hold on the lock
from inode_dealloc_init() for deadlock reasons. */

gfs2_holder_reinit(LM_ST_EXCLUSIVE, LM_FLAG_TRY, io_gh);
error = gfs2_glock_nq(io_gh);
switch (error) {
error = gfs2_glock_nq_num(sdp, ul->ul_ut.ut_inum.no_addr,
&gfs2_inode_glops, LM_ST_EXCLUSIVE,
LM_FLAG_TRY_1CB, &i_gh);
switch(error) {
case 0:
break;
case GLR_TRYFAILED:
error = 1;
return 1; /* or back off and relock in different order? */
default:
goto out;
return error;
}

gfs2_assert_warn(sdp, !i_gh.gh_gl->gl_object);
error = inode_create(i_gh.gh_gl, &ul->ul_ut.ut_inum, io_gh->gh_gl,
LM_ST_EXCLUSIVE, &ip);

gfs2_glock_dq(io_gh);
LM_ST_EXCLUSIVE, &ip, 0);

if (error)
goto out;
Expand Down Expand Up @@ -568,13 +567,13 @@ static int inode_dealloc(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul,
if (error)
goto out_iput;

out_iput:
out_iput:
gfs2_glmutex_lock(i_gh.gh_gl);
gfs2_inode_put(ip);
gfs2_inode_destroy(ip);
gfs2_inode_destroy(ip, 0);
gfs2_glmutex_unlock(i_gh.gh_gl);

out:
out:
gfs2_glock_dq_uninit(&i_gh);

return error;
Expand All @@ -589,14 +588,13 @@ static int inode_dealloc(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul,

static int try_inode_dealloc(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul)
{
struct gfs2_holder io_gh;
int error = 0;
struct gfs2_holder iogh;

gfs2_try_toss_inode(sdp, &ul->ul_ut.ut_inum);

error = gfs2_glock_nq_num(sdp,
ul->ul_ut.ut_inum.no_addr, &gfs2_iopen_glops,
LM_ST_EXCLUSIVE, LM_FLAG_TRY_1CB, &io_gh);
error = gfs2_glock_nq_num(sdp, ul->ul_ut.ut_inum.no_addr,
&gfs2_iopen_glops, LM_ST_EXCLUSIVE,
LM_FLAG_TRY_1CB, &iogh);
switch (error) {
case 0:
break;
Expand All @@ -606,9 +604,8 @@ static int try_inode_dealloc(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul)
return error;
}

gfs2_glock_dq(&io_gh);
error = inode_dealloc(sdp, ul, &io_gh);
gfs2_holder_uninit(&io_gh);
error = inode_dealloc(sdp, ul, &iogh);
gfs2_glock_dq_uninit(&iogh);

return error;
}
Expand All @@ -634,9 +631,7 @@ static int inode_dealloc_uninit(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul)
if (error)
goto out;

error = gfs2_trans_begin(sdp,
RES_RG_BIT + RES_UNLINKED + RES_STATFS,
0);
error = gfs2_trans_begin(sdp, RES_RG_BIT + RES_UNLINKED + RES_STATFS, 0);
if (error)
goto out_gunlock;

Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/gfs2/inode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ int gfs2_inode_get(struct gfs2_glock *i_gl,
struct gfs2_inode **ipp);
void gfs2_inode_hold(struct gfs2_inode *ip);
void gfs2_inode_put(struct gfs2_inode *ip);
void gfs2_inode_destroy(struct gfs2_inode *ip);
void gfs2_inode_destroy(struct gfs2_inode *ip, int unlock);

int gfs2_inode_dealloc(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul);

Expand Down

0 comments on commit f244d3b

Please sign in to comment.