diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-22 16:25:50 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-22 16:25:50 -0400 |
commit | b8e1aabf218a2037d9d6a3256c33fc6ef96ac44c (patch) | |
tree | 2f2dc82e7b53b6316f1eee996f6d930ffb9aa4c4 /fs/gfs2/rgrp.c | |
parent | 08867605e1d5f575685aa2b5bf575aba3d996758 (diff) |
[GFS2] Another list_del bug
Another case where list_del should be list_del_init.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/rgrp.c')
-rw-r--r-- | fs/gfs2/rgrp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 4e0357dc838b..84fcc1bfaf1b 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
@@ -857,8 +857,7 @@ static struct gfs2_rgrpd *forward_rgrp_get(struct gfs2_sbd *sdp) | |||
857 | if (sdp->sd_rgrps >= journals) | 857 | if (sdp->sd_rgrps >= journals) |
858 | rg = sdp->sd_rgrps * sdp->sd_jdesc->jd_jid / journals; | 858 | rg = sdp->sd_rgrps * sdp->sd_jdesc->jd_jid / journals; |
859 | 859 | ||
860 | for (x = 0, rgd = gfs2_rgrpd_get_first(sdp); | 860 | for (x = 0, rgd = gfs2_rgrpd_get_first(sdp); x < rg; |
861 | x < rg; | ||
862 | x++, rgd = gfs2_rgrpd_get_next(rgd)) | 861 | x++, rgd = gfs2_rgrpd_get_next(rgd)) |
863 | /* Do Nothing */; | 862 | /* Do Nothing */; |
864 | 863 | ||
@@ -909,9 +908,8 @@ static int get_local_rgrp(struct gfs2_inode *ip) | |||
909 | rgd = recent_rgrp_first(sdp, ip->i_last_rg_alloc); | 908 | rgd = recent_rgrp_first(sdp, ip->i_last_rg_alloc); |
910 | 909 | ||
911 | while (rgd) { | 910 | while (rgd) { |
912 | error = gfs2_glock_nq_init(rgd->rd_gl, | 911 | error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, |
913 | LM_ST_EXCLUSIVE, LM_FLAG_TRY, | 912 | LM_FLAG_TRY, &al->al_rgd_gh); |
914 | &al->al_rgd_gh); | ||
915 | switch (error) { | 913 | switch (error) { |
916 | case 0: | 914 | case 0: |
917 | if (try_rgrp_fit(rgd, al)) | 915 | if (try_rgrp_fit(rgd, al)) |
@@ -934,8 +932,7 @@ static int get_local_rgrp(struct gfs2_inode *ip) | |||
934 | begin = rgd = forward_rgrp_get(sdp); | 932 | begin = rgd = forward_rgrp_get(sdp); |
935 | 933 | ||
936 | for (;;) { | 934 | for (;;) { |
937 | error = gfs2_glock_nq_init(rgd->rd_gl, | 935 | error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, flags, |
938 | LM_ST_EXCLUSIVE, flags, | ||
939 | &al->al_rgd_gh); | 936 | &al->al_rgd_gh); |
940 | switch (error) { | 937 | switch (error) { |
941 | case 0: | 938 | case 0: |