udf: Fix oops when invalid character in filename occurs

[linux-2.6-omap-h63xx.git] / fs / gfs2 / trans.c

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 73e5d92a657ca4aa119afb3658814d648ac4486a..053752d4b27f0c3dc52578c5066245e0fb793c69 100644 (file)
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -12,9 +12,8 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
-#include <linux/gfs2_ondisk.h>
 #include <linux/kallsyms.h>
-#include <linux/lm_interface.h>
+#include <linux/gfs2_ondisk.h>
 
 #include "gfs2.h"
 #include "incore.h"
@@ -88,9 +87,11 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
 
        if (!tr->tr_touched) {
                gfs2_log_release(sdp, tr->tr_reserved);
-               gfs2_glock_dq(&tr->tr_t_gh);
-               gfs2_holder_uninit(&tr->tr_t_gh);
-               kfree(tr);
+               if (tr->tr_t_gh.gh_gl) {
+                       gfs2_glock_dq(&tr->tr_t_gh);
+                       gfs2_holder_uninit(&tr->tr_t_gh);
+                       kfree(tr);
+               }
                return;
        }
 
@@ -106,9 +107,11 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
        }
 
        gfs2_log_commit(sdp, tr);
-        gfs2_glock_dq(&tr->tr_t_gh);
-        gfs2_holder_uninit(&tr->tr_t_gh);
-        kfree(tr);
+       if (tr->tr_t_gh.gh_gl) {
+               gfs2_glock_dq(&tr->tr_t_gh);
+               gfs2_holder_uninit(&tr->tr_t_gh);
+               kfree(tr);
+       }
 
        if (sdp->sd_vfs->s_flags & MS_SYNCHRONOUS)
                gfs2_log_flush(sdp, NULL);
@@ -146,30 +149,25 @@ void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
        lops_add(sdp, &bd->bd_le);
 }
 
-void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno)
+void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)
 {
-       struct gfs2_bufdata *bd;
-       int found = 0;
+       struct gfs2_bufdata *bd, *tmp;
+       struct gfs2_trans *tr = current->journal_info;
+       unsigned int n = len;
 
        gfs2_log_lock(sdp);
-
-       list_for_each_entry(bd, &sdp->sd_log_le_revoke, bd_le.le_list) {
-               if (bd->bd_blkno == blkno) {
+       list_for_each_entry_safe(bd, tmp, &sdp->sd_log_le_revoke, bd_le.le_list) {
+               if ((bd->bd_blkno >= blkno) && (bd->bd_blkno < (blkno + len))) {
                        list_del_init(&bd->bd_le.le_list);
                        gfs2_assert_withdraw(sdp, sdp->sd_log_num_revoke);
                        sdp->sd_log_num_revoke--;
-                       found = 1;
-                       break;
+                       kmem_cache_free(gfs2_bufdata_cachep, bd);
+                       tr->tr_num_revoke_rm++;
+                       if (--n == 0)
+                               break;
                }
        }
-
        gfs2_log_unlock(sdp);
-
-       if (found) {
-               struct gfs2_trans *tr = current->journal_info;
-               kmem_cache_free(gfs2_bufdata_cachep, bd);
-               tr->tr_num_revoke_rm++;
-       }
 }
 
 void gfs2_trans_add_rg(struct gfs2_rgrpd *rgd)