NFS: Reduce stack footprint of nfs_setattr()
[safe/jmp/linux-2.6] / fs / gfs2 / glops.c
index 9c20337..49f97d3 100644 (file)
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
  * of the GNU General Public License version 2.
  */
 
-#include <linux/sched.h>
-#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
-#include <linux/lm_interface.h>
+#include <linux/bio.h>
+#include <linux/posix_acl.h>
 
 #include "gfs2.h"
 #include "incore.h"
 static void gfs2_ail_empty_gl(struct gfs2_glock *gl)
 {
        struct gfs2_sbd *sdp = gl->gl_sbd;
-       unsigned int blocks;
        struct list_head *head = &gl->gl_ail_list;
        struct gfs2_bufdata *bd;
        struct buffer_head *bh;
-       u64 blkno;
-       int error;
+       struct gfs2_trans tr;
 
-       blocks = atomic_read(&gl->gl_ail_count);
-       if (!blocks)
-               return;
+       memset(&tr, 0, sizeof(tr));
+       tr.tr_revokes = atomic_read(&gl->gl_ail_count);
 
-       error = gfs2_trans_begin(sdp, 0, blocks);
-       if (gfs2_assert_withdraw(sdp, !error))
+       if (!tr.tr_revokes)
                return;
 
+       /* A shortened, inline version of gfs2_trans_begin() */
+       tr.tr_reserved = 1 + gfs2_struct2blk(sdp, tr.tr_revokes, sizeof(u64));
+       tr.tr_ip = (unsigned long)__builtin_return_address(0);
+       INIT_LIST_HEAD(&tr.tr_list_buf);
+       gfs2_log_reserve(sdp, tr.tr_reserved);
+       BUG_ON(current->journal_info);
+       current->journal_info = &tr;
+
        gfs2_log_lock(sdp);
        while (!list_empty(head)) {
                bd = list_entry(head->next, struct gfs2_bufdata,
                                bd_ail_gl_list);
                bh = bd->bd_bh;
-               blkno = bh->b_blocknr;
+               gfs2_remove_from_ail(bd);
+               bd->bd_bh = NULL;
+               bh->b_private = NULL;
+               bd->bd_blkno = bh->b_blocknr;
                gfs2_assert_withdraw(sdp, !buffer_busy(bh));
-
-               bd->bd_ail = NULL;
-               list_del(&bd->bd_ail_st_list);
-               list_del(&bd->bd_ail_gl_list);
-               atomic_dec(&gl->gl_ail_count);
-               brelse(bh);
-               gfs2_log_unlock(sdp);
-
-               gfs2_trans_add_revoke(sdp, blkno);
-
-               gfs2_log_lock(sdp);
+               gfs2_trans_add_revoke(sdp, bd);
        }
        gfs2_assert_withdraw(sdp, !atomic_read(&gl->gl_ail_count));
        gfs2_log_unlock(sdp);
@@ -80,237 +76,124 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl)
 }
 
 /**
- * gfs2_pte_inval - Sync and invalidate all PTEs associated with a glock
- * @gl: the glock
- *
- */
-
-static void gfs2_pte_inval(struct gfs2_glock *gl)
-{
-       struct gfs2_inode *ip;
-       struct inode *inode;
-
-       ip = gl->gl_object;
-       inode = &ip->i_inode;
-       if (!ip || !S_ISREG(inode->i_mode))
-               return;
-
-       if (!test_bit(GIF_PAGED, &ip->i_flags))
-               return;
-
-       unmap_shared_mapping_range(inode->i_mapping, 0, 0);
-
-       if (test_bit(GIF_SW_PAGED, &ip->i_flags))
-               set_bit(GLF_DIRTY, &gl->gl_flags);
-
-       clear_bit(GIF_SW_PAGED, &ip->i_flags);
-}
-
-/**
- * gfs2_page_inval - Invalidate all pages associated with a glock
- * @gl: the glock
- *
- */
-
-static void gfs2_page_inval(struct gfs2_glock *gl)
-{
-       struct gfs2_inode *ip;
-       struct inode *inode;
-
-       ip = gl->gl_object;
-       inode = &ip->i_inode;
-       if (!ip || !S_ISREG(inode->i_mode))
-               return;
-
-       truncate_inode_pages(inode->i_mapping, 0);
-       gfs2_assert_withdraw(GFS2_SB(&ip->i_inode), !inode->i_mapping->nrpages);
-       clear_bit(GIF_PAGED, &ip->i_flags);
-}
-
-/**
- * gfs2_page_wait - Wait for writeback of data
- * @gl: the glock
- *
- * Syncs data (not metadata) for a regular file.
- * No-op for all other types.
- */
-
-static void gfs2_page_wait(struct gfs2_glock *gl)
-{
-       struct gfs2_inode *ip = gl->gl_object;
-       struct inode *inode = &ip->i_inode;
-       struct address_space *mapping = inode->i_mapping;
-       int error;
-
-       if (!S_ISREG(inode->i_mode))
-               return;
-
-       error = filemap_fdatawait(mapping);
-
-       /* Put back any errors cleared by filemap_fdatawait()
-          so they can be caught by someone who can pass them
-          up to user space. */
-
-       if (error == -ENOSPC)
-               set_bit(AS_ENOSPC, &mapping->flags);
-       else if (error)
-               set_bit(AS_EIO, &mapping->flags);
-
-}
-
-static void gfs2_page_writeback(struct gfs2_glock *gl)
-{
-       struct gfs2_inode *ip = gl->gl_object;
-       struct inode *inode = &ip->i_inode;
-       struct address_space *mapping = inode->i_mapping;
-
-       if (!S_ISREG(inode->i_mode))
-               return;
-
-       filemap_fdatawrite(mapping);
-}
-
-/**
- * meta_go_sync - sync out the metadata for this glock
+ * rgrp_go_sync - sync out the metadata for this glock
  * @gl: the glock
- * @flags: DIO_*
  *
  * Called when demoting or unlocking an EX glock.  We must flush
  * to disk all dirty buffers/pages relating to this glock, and must not
  * not return to caller to demote/unlock the glock until I/O is complete.
  */
 
-static void meta_go_sync(struct gfs2_glock *gl, int flags)
+static void rgrp_go_sync(struct gfs2_glock *gl)
 {
-       if (!(flags & DIO_METADATA))
-               return;
-
-       if (test_and_clear_bit(GLF_DIRTY, &gl->gl_flags)) {
-               gfs2_log_flush(gl->gl_sbd, gl);
-               gfs2_meta_sync(gl);
-               if (flags & DIO_RELEASE)
-                       gfs2_ail_empty_gl(gl);
-       }
-
-}
-
-/**
- * meta_go_inval - invalidate the metadata for this glock
- * @gl: the glock
- * @flags:
- *
- */
+       struct address_space *metamapping = gfs2_glock2aspace(gl);
+       int error;
 
-static void meta_go_inval(struct gfs2_glock *gl, int flags)
-{
-       if (!(flags & DIO_METADATA))
+       if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
                return;
+       BUG_ON(gl->gl_state != LM_ST_EXCLUSIVE);
 
-       gfs2_meta_inval(gl);
-       gl->gl_vn++;
+       gfs2_log_flush(gl->gl_sbd, gl);
+       filemap_fdatawrite(metamapping);
+       error = filemap_fdatawait(metamapping);
+        mapping_set_error(metamapping, error);
+       gfs2_ail_empty_gl(gl);
 }
 
 /**
- * inode_go_xmote_th - promote/demote a glock
+ * rgrp_go_inval - invalidate the metadata for this glock
  * @gl: the glock
- * @state: the requested state
  * @flags:
  *
- */
-
-static void inode_go_xmote_th(struct gfs2_glock *gl, unsigned int state,
-                             int flags)
-{
-       if (gl->gl_state != LM_ST_UNLOCKED)
-               gfs2_pte_inval(gl);
-       gfs2_glock_xmote_th(gl, state, flags);
-}
-
-/**
- * inode_go_xmote_bh - After promoting/demoting a glock
- * @gl: the glock
+ * We never used LM_ST_DEFERRED with resource groups, so that we
+ * should always see the metadata flag set here.
  *
  */
 
-static void inode_go_xmote_bh(struct gfs2_glock *gl)
+static void rgrp_go_inval(struct gfs2_glock *gl, int flags)
 {
-       struct gfs2_holder *gh = gl->gl_req_gh;
-       struct buffer_head *bh;
-       int error;
-
-       if (gl->gl_state != LM_ST_UNLOCKED &&
-           (!gh || !(gh->gh_flags & GL_SKIP))) {
-               error = gfs2_meta_read(gl, gl->gl_name.ln_number, 0, &bh);
-               if (!error)
-                       brelse(bh);
-       }
-}
+       struct address_space *mapping = gfs2_glock2aspace(gl);
 
-/**
- * inode_go_drop_th - unlock a glock
- * @gl: the glock
- *
- * Invoked from rq_demote().
- * Another node needs the lock in EXCLUSIVE mode, or lock (unused for too long)
- * is being purged from our node's glock cache; we're dropping lock.
- */
+       BUG_ON(!(flags & DIO_METADATA));
+       gfs2_assert_withdraw(gl->gl_sbd, !atomic_read(&gl->gl_ail_count));
+       truncate_inode_pages(mapping, 0);
 
-static void inode_go_drop_th(struct gfs2_glock *gl)
-{
-       gfs2_pte_inval(gl);
-       gfs2_glock_drop_th(gl);
+       if (gl->gl_object) {
+               struct gfs2_rgrpd *rgd = (struct gfs2_rgrpd *)gl->gl_object;
+               rgd->rd_flags &= ~GFS2_RDF_UPTODATE;
+       }
 }
 
 /**
  * inode_go_sync - Sync the dirty data and/or metadata for an inode glock
  * @gl: the glock protecting the inode
- * @flags:
  *
  */
 
-static void inode_go_sync(struct gfs2_glock *gl, int flags)
+static void inode_go_sync(struct gfs2_glock *gl)
 {
-       int meta = (flags & DIO_METADATA);
-       int data = (flags & DIO_DATA);
-
-       if (test_bit(GLF_DIRTY, &gl->gl_flags)) {
-               if (meta && data) {
-                       gfs2_page_writeback(gl);
-                       gfs2_log_flush(gl->gl_sbd, gl);
-                       gfs2_meta_sync(gl);
-                       gfs2_page_wait(gl);
-                       clear_bit(GLF_DIRTY, &gl->gl_flags);
-               } else if (meta) {
-                       gfs2_log_flush(gl->gl_sbd, gl);
-                       gfs2_meta_sync(gl);
-               } else if (data) {
-                       gfs2_page_writeback(gl);
-                       gfs2_page_wait(gl);
-               }
-               if (flags & DIO_RELEASE)
-                       gfs2_ail_empty_gl(gl);
+       struct gfs2_inode *ip = gl->gl_object;
+       struct address_space *metamapping = gfs2_glock2aspace(gl);
+       int error;
+
+       if (ip && !S_ISREG(ip->i_inode.i_mode))
+               ip = NULL;
+       if (ip && test_and_clear_bit(GIF_SW_PAGED, &ip->i_flags))
+               unmap_shared_mapping_range(ip->i_inode.i_mapping, 0, 0);
+       if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
+               return;
+
+       BUG_ON(gl->gl_state != LM_ST_EXCLUSIVE);
+
+       gfs2_log_flush(gl->gl_sbd, gl);
+       filemap_fdatawrite(metamapping);
+       if (ip) {
+               struct address_space *mapping = ip->i_inode.i_mapping;
+               filemap_fdatawrite(mapping);
+               error = filemap_fdatawait(mapping);
+               mapping_set_error(mapping, error);
        }
+       error = filemap_fdatawait(metamapping);
+       mapping_set_error(metamapping, error);
+       gfs2_ail_empty_gl(gl);
+       /*
+        * Writeback of the data mapping may cause the dirty flag to be set
+        * so we have to clear it again here.
+        */
+       smp_mb__before_clear_bit();
+       clear_bit(GLF_DIRTY, &gl->gl_flags);
 }
 
 /**
  * inode_go_inval - prepare a inode glock to be released
  * @gl: the glock
  * @flags:
+ * 
+ * Normally we invlidate everything, but if we are moving into
+ * LM_ST_DEFERRED from LM_ST_SHARED or LM_ST_EXCLUSIVE then we
+ * can keep hold of the metadata, since it won't have changed.
  *
  */
 
 static void inode_go_inval(struct gfs2_glock *gl, int flags)
 {
-       int meta = (flags & DIO_METADATA);
-       int data = (flags & DIO_DATA);
+       struct gfs2_inode *ip = gl->gl_object;
 
-       if (meta) {
-               struct gfs2_inode *ip = gl->gl_object;
-               gfs2_meta_inval(gl);
-               set_bit(GIF_INVALID, &ip->i_flags);
+       gfs2_assert_withdraw(gl->gl_sbd, !atomic_read(&gl->gl_ail_count));
+
+       if (flags & DIO_METADATA) {
+               struct address_space *mapping = gfs2_glock2aspace(gl);
+               truncate_inode_pages(mapping, 0);
+               if (ip) {
+                       set_bit(GIF_INVALID, &ip->i_flags);
+                       forget_all_cached_acls(&ip->i_inode);
+               }
        }
-       if (data)
-               gfs2_page_inval(gl);
+
+       if (ip == GFS2_I(gl->gl_sbd->sd_rindex))
+               gl->gl_sbd->sd_rindex_uptodate = 0;
+       if (ip && S_ISREG(ip->i_inode.i_mode))
+               truncate_inode_pages(ip->i_inode.i_mapping, 0);
 }
 
 /**
@@ -320,19 +203,12 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags)
  * Returns: 1 if it's ok
  */
 
-static int inode_go_demote_ok(struct gfs2_glock *gl)
+static int inode_go_demote_ok(const struct gfs2_glock *gl)
 {
        struct gfs2_sbd *sdp = gl->gl_sbd;
-       int demote = 0;
-
-       if (!gl->gl_object && !gl->gl_aspace->i_mapping->nrpages)
-               demote = 1;
-       else if (!sdp->sd_args.ar_localcaching &&
-                time_after_eq(jiffies, gl->gl_stamp +
-                              gfs2_tune_get(sdp, gt_demote_secs) * HZ))
-               demote = 1;
-
-       return demote;
+       if (sdp->sd_jindex == gl->gl_object || sdp->sd_rindex == gl->gl_object)
+               return 0;
+       return 1;
 }
 
 /**
@@ -346,78 +222,54 @@ static int inode_go_demote_ok(struct gfs2_glock *gl)
 static int inode_go_lock(struct gfs2_holder *gh)
 {
        struct gfs2_glock *gl = gh->gh_gl;
+       struct gfs2_sbd *sdp = gl->gl_sbd;
        struct gfs2_inode *ip = gl->gl_object;
        int error = 0;
 
-       if (!ip)
+       if (!ip || (gh->gh_flags & GL_SKIP))
                return 0;
 
        if (test_bit(GIF_INVALID, &ip->i_flags)) {
                error = gfs2_inode_refresh(ip);
                if (error)
                        return error;
-               gfs2_inode_attr_in(ip);
        }
 
-       if ((ip->i_di.di_flags & GFS2_DIF_TRUNC_IN_PROG) &&
+       if ((ip->i_diskflags & GFS2_DIF_TRUNC_IN_PROG) &&
            (gl->gl_state == LM_ST_EXCLUSIVE) &&
-           (gh->gh_flags & GL_LOCAL_EXCL))
-               error = gfs2_truncatei_resume(ip);
+           (gh->gh_state == LM_ST_EXCLUSIVE)) {
+               spin_lock(&sdp->sd_trunc_lock);
+               if (list_empty(&ip->i_trunc_list))
+                       list_add(&sdp->sd_trunc_list, &ip->i_trunc_list);
+               spin_unlock(&sdp->sd_trunc_lock);
+               wake_up(&sdp->sd_quota_wait);
+               return 1;
+       }
 
        return error;
 }
 
 /**
- * inode_go_unlock - operation done before an inode lock is unlocked by a
- *                  process
- * @gl: the glock
- * @flags:
+ * inode_go_dump - print information about an inode
+ * @seq: The iterator
+ * @ip: the inode
  *
+ * Returns: 0 on success, -ENOBUFS when we run out of space
  */
 
-static void inode_go_unlock(struct gfs2_holder *gh)
+static int inode_go_dump(struct seq_file *seq, const struct gfs2_glock *gl)
 {
-       struct gfs2_glock *gl = gh->gh_gl;
-       struct gfs2_inode *ip = gl->gl_object;
-
+       const struct gfs2_inode *ip = gl->gl_object;
        if (ip == NULL)
-               return;
-       if (test_bit(GLF_DIRTY, &gl->gl_flags))
-               gfs2_inode_attr_in(ip);
-       gfs2_meta_cache_flush(ip);
-}
-
-/**
- * inode_greedy -
- * @gl: the glock
- *
- */
-
-static void inode_greedy(struct gfs2_glock *gl)
-{
-       struct gfs2_sbd *sdp = gl->gl_sbd;
-       struct gfs2_inode *ip = gl->gl_object;
-       unsigned int quantum = gfs2_tune_get(sdp, gt_greedy_quantum);
-       unsigned int max = gfs2_tune_get(sdp, gt_greedy_max);
-       unsigned int new_time;
-
-       spin_lock(&ip->i_spin);
-
-       if (time_after(ip->i_last_pfault + quantum, jiffies)) {
-               new_time = ip->i_greedy + quantum;
-               if (new_time > max)
-                       new_time = max;
-       } else {
-               new_time = ip->i_greedy - quantum;
-               if (!new_time || new_time > max)
-                       new_time = 1;
-       }
-
-       ip->i_greedy = new_time;
-
-       spin_unlock(&ip->i_spin);
-
-       iput(&ip->i_inode);
+               return 0;
+       gfs2_print_dbg(seq, " I: n:%llu/%llu t:%u f:0x%02lx d:0x%08x s:%llu/%llu\n",
+                 (unsigned long long)ip->i_no_formal_ino,
+                 (unsigned long long)ip->i_no_addr,
+                 IF2DT(ip->i_inode.i_mode), ip->i_flags,
+                 (unsigned int)ip->i_diskflags,
+                 (unsigned long long)ip->i_inode.i_size,
+                 (unsigned long long)ip->i_disksize);
+       return 0;
 }
 
 /**
@@ -427,9 +279,10 @@ static void inode_greedy(struct gfs2_glock *gl)
  * Returns: 1 if it's ok
  */
 
-static int rgrp_go_demote_ok(struct gfs2_glock *gl)
+static int rgrp_go_demote_ok(const struct gfs2_glock *gl)
 {
-       return !gl->gl_aspace->i_mapping->nrpages;
+       const struct address_space *mapping = (const struct address_space *)(gl + 1);
+       return !mapping->nrpages;
 }
 
 /**
@@ -460,25 +313,23 @@ static void rgrp_go_unlock(struct gfs2_holder *gh)
 }
 
 /**
- * trans_go_xmote_th - promote/demote the transaction glock
+ * trans_go_sync - promote/demote the transaction glock
  * @gl: the glock
  * @state: the requested state
  * @flags:
  *
  */
 
-static void trans_go_xmote_th(struct gfs2_glock *gl, unsigned int state,
-                             int flags)
+static void trans_go_sync(struct gfs2_glock *gl)
 {
        struct gfs2_sbd *sdp = gl->gl_sbd;
 
        if (gl->gl_state != LM_ST_UNLOCKED &&
            test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {
+               flush_workqueue(gfs2_delete_workqueue);
                gfs2_meta_syncfs(sdp);
                gfs2_log_shutdown(sdp);
        }
-
-       gfs2_glock_xmote_th(gl, state, flags);
 }
 
 /**
@@ -487,7 +338,7 @@ static void trans_go_xmote_th(struct gfs2_glock *gl, unsigned int state,
  *
  */
 
-static void trans_go_xmote_bh(struct gfs2_glock *gl)
+static int trans_go_xmote_bh(struct gfs2_glock *gl, struct gfs2_holder *gh)
 {
        struct gfs2_sbd *sdp = gl->gl_sbd;
        struct gfs2_inode *ip = GFS2_I(sdp->sd_jdesc->jd_inode);
@@ -495,10 +346,8 @@ static void trans_go_xmote_bh(struct gfs2_glock *gl)
        struct gfs2_log_header_host head;
        int error;
 
-       if (gl->gl_state != LM_ST_UNLOCKED &&
-           test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {
-               gfs2_meta_cache_flush(GFS2_I(sdp->sd_jdesc->jd_inode));
-               j_gl->gl_ops->go_inval(j_gl, DIO_METADATA | DIO_DATA);
+       if (test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {
+               j_gl->gl_ops->go_inval(j_gl, DIO_METADATA);
 
                error = gfs2_find_jhead(sdp->sd_jdesc, &head);
                if (error)
@@ -512,105 +361,103 @@ static void trans_go_xmote_bh(struct gfs2_glock *gl)
                        gfs2_log_pointers_init(sdp, head.lh_blkno);
                }
        }
+       return 0;
 }
 
 /**
- * trans_go_drop_th - unlock the transaction glock
+ * trans_go_demote_ok
  * @gl: the glock
  *
- * We want to sync the device even with localcaching.  Remember
- * that localcaching journal replay only marks buffers dirty.
+ * Always returns 0
  */
 
-static void trans_go_drop_th(struct gfs2_glock *gl)
+static int trans_go_demote_ok(const struct gfs2_glock *gl)
 {
-       struct gfs2_sbd *sdp = gl->gl_sbd;
-
-       if (test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {
-               gfs2_meta_syncfs(sdp);
-               gfs2_log_shutdown(sdp);
-       }
-
-       gfs2_glock_drop_th(gl);
+       return 0;
 }
 
 /**
- * quota_go_demote_ok - Check to see if it's ok to unlock a quota glock
+ * iopen_go_callback - schedule the dcache entry for the inode to be deleted
  * @gl: the glock
  *
- * Returns: 1 if it's ok
+ * gl_spin lock is held while calling this
  */
-
-static int quota_go_demote_ok(struct gfs2_glock *gl)
+static void iopen_go_callback(struct gfs2_glock *gl)
 {
-       return !atomic_read(&gl->gl_lvb_count);
+       struct gfs2_inode *ip = (struct gfs2_inode *)gl->gl_object;
+
+       if (gl->gl_demote_state == LM_ST_UNLOCKED &&
+           gl->gl_state == LM_ST_SHARED && ip) {
+               gfs2_glock_hold(gl);
+               if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
+                       gfs2_glock_put_nolock(gl);
+       }
 }
 
 const struct gfs2_glock_operations gfs2_meta_glops = {
-       .go_xmote_th = gfs2_glock_xmote_th,
-       .go_drop_th = gfs2_glock_drop_th,
        .go_type = LM_TYPE_META,
 };
 
 const struct gfs2_glock_operations gfs2_inode_glops = {
-       .go_xmote_th = inode_go_xmote_th,
-       .go_xmote_bh = inode_go_xmote_bh,
-       .go_drop_th = inode_go_drop_th,
-       .go_sync = inode_go_sync,
+       .go_xmote_th = inode_go_sync,
        .go_inval = inode_go_inval,
        .go_demote_ok = inode_go_demote_ok,
        .go_lock = inode_go_lock,
-       .go_unlock = inode_go_unlock,
-       .go_greedy = inode_greedy,
+       .go_dump = inode_go_dump,
        .go_type = LM_TYPE_INODE,
+       .go_min_hold_time = HZ / 5,
+       .go_flags = GLOF_ASPACE,
 };
 
 const struct gfs2_glock_operations gfs2_rgrp_glops = {
-       .go_xmote_th = gfs2_glock_xmote_th,
-       .go_drop_th = gfs2_glock_drop_th,
-       .go_sync = meta_go_sync,
-       .go_inval = meta_go_inval,
+       .go_xmote_th = rgrp_go_sync,
+       .go_inval = rgrp_go_inval,
        .go_demote_ok = rgrp_go_demote_ok,
        .go_lock = rgrp_go_lock,
        .go_unlock = rgrp_go_unlock,
+       .go_dump = gfs2_rgrp_dump,
        .go_type = LM_TYPE_RGRP,
+       .go_min_hold_time = HZ / 5,
+       .go_flags = GLOF_ASPACE,
 };
 
 const struct gfs2_glock_operations gfs2_trans_glops = {
-       .go_xmote_th = trans_go_xmote_th,
+       .go_xmote_th = trans_go_sync,
        .go_xmote_bh = trans_go_xmote_bh,
-       .go_drop_th = trans_go_drop_th,
+       .go_demote_ok = trans_go_demote_ok,
        .go_type = LM_TYPE_NONDISK,
 };
 
 const struct gfs2_glock_operations gfs2_iopen_glops = {
-       .go_xmote_th = gfs2_glock_xmote_th,
-       .go_drop_th = gfs2_glock_drop_th,
        .go_type = LM_TYPE_IOPEN,
+       .go_callback = iopen_go_callback,
 };
 
 const struct gfs2_glock_operations gfs2_flock_glops = {
-       .go_xmote_th = gfs2_glock_xmote_th,
-       .go_drop_th = gfs2_glock_drop_th,
        .go_type = LM_TYPE_FLOCK,
 };
 
 const struct gfs2_glock_operations gfs2_nondisk_glops = {
-       .go_xmote_th = gfs2_glock_xmote_th,
-       .go_drop_th = gfs2_glock_drop_th,
        .go_type = LM_TYPE_NONDISK,
 };
 
 const struct gfs2_glock_operations gfs2_quota_glops = {
-       .go_xmote_th = gfs2_glock_xmote_th,
-       .go_drop_th = gfs2_glock_drop_th,
-       .go_demote_ok = quota_go_demote_ok,
        .go_type = LM_TYPE_QUOTA,
 };
 
 const struct gfs2_glock_operations gfs2_journal_glops = {
-       .go_xmote_th = gfs2_glock_xmote_th,
-       .go_drop_th = gfs2_glock_drop_th,
        .go_type = LM_TYPE_JOURNAL,
 };
 
+const struct gfs2_glock_operations *gfs2_glops_list[] = {
+       [LM_TYPE_META] = &gfs2_meta_glops,
+       [LM_TYPE_INODE] = &gfs2_inode_glops,
+       [LM_TYPE_RGRP] = &gfs2_rgrp_glops,
+       [LM_TYPE_NONDISK] = &gfs2_trans_glops,
+       [LM_TYPE_IOPEN] = &gfs2_iopen_glops,
+       [LM_TYPE_FLOCK] = &gfs2_flock_glops,
+       [LM_TYPE_NONDISK] = &gfs2_nondisk_glops,
+       [LM_TYPE_QUOTA] = &gfs2_quota_glops,
+       [LM_TYPE_JOURNAL] = &gfs2_journal_glops,
+};
+