Revert "nfsd4: fix error return when pseudoroot missing"

[safe/jmp/linux-2.6] / fs / gfs2 / trans.c

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index acf8401..4ef0e9f 100644 (file)
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -12,11 +12,10 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
-#include <linux/gfs2_ondisk.h>
 #include <linux/kallsyms.h>
+#include <linux/gfs2_ondisk.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "glock.h"
 #include "log.h"
@@ -34,6 +33,9 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
        BUG_ON(current->journal_info);
        BUG_ON(blocks == 0 && revokes == 0);
 
+       if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags))
+               return -EROFS;
+
        tr = kzalloc(sizeof(struct gfs2_trans), GFP_NOFS);
        if (!tr)
                return -ENOMEM;
@@ -55,12 +57,6 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
        if (error)
                goto fail_holder_uninit;
 
-       if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {
-               tr->tr_t_gh.gh_flags |= GL_NOCACHE;
-               error = -EROFS;
-               goto fail_gunlock;
-       }
-
        error = gfs2_log_reserve(sdp, tr->tr_reserved);
        if (error)
                goto fail_gunlock;
@@ -88,9 +84,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,19 +104,16 @@ 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);
 }
 
-void gfs2_trans_add_gl(struct gfs2_glock *gl)
-{
-       lops_add(gl->gl_sbd, &gl->gl_le);
-}
-
 /**
  * gfs2_trans_add_bh - Add a to-be-modified buffer to the current transaction
  * @gl: the glock the buffer belongs to
@@ -142,39 +137,34 @@ void gfs2_trans_add_bh(struct gfs2_glock *gl, struct buffer_head *bh, int meta)
        lops_add(sdp, &bd->bd_le);
 }
 
-void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, u64 blkno)
+void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
 {
-       struct gfs2_revoke *rv = kmalloc(sizeof(struct gfs2_revoke),
-                                        GFP_NOFS | __GFP_NOFAIL);
-       lops_init_le(&rv->rv_le, &gfs2_revoke_lops);
-       rv->rv_blkno = blkno;
-       lops_add(sdp, &rv->rv_le);
+       BUG_ON(!list_empty(&bd->bd_le.le_list));
+       BUG_ON(!list_empty(&bd->bd_ail_st_list));
+       BUG_ON(!list_empty(&bd->bd_ail_gl_list));
+       lops_init_le(&bd->bd_le, &gfs2_revoke_lops);
+       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_revoke *rv;
-       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(rv, &sdp->sd_log_le_revoke, rv_le.le_list) {
-               if (rv->rv_blkno == blkno) {
-                       list_del(&rv->rv_le.le_list);
+       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;
-               kfree(rv);
-               tr->tr_num_revoke_rm++;
-       }
 }
 
 void gfs2_trans_add_rg(struct gfs2_rgrpd *rgd)