block: separate priority boosting from REQ_META
[linux-2.6.git] / fs / gfs2 / util.c
index 2852431..5351129 100644 (file)
@@ -7,8 +7,6 @@
  * 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 <asm/uaccess.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "glock.h"
-#include "lm.h"
 #include "util.h"
 
-kmem_cache_t *gfs2_glock_cachep __read_mostly;
-kmem_cache_t *gfs2_inode_cachep __read_mostly;
-kmem_cache_t *gfs2_bufdata_cachep __read_mostly;
+struct kmem_cache *gfs2_glock_cachep __read_mostly;
+struct kmem_cache *gfs2_glock_aspace_cachep __read_mostly;
+struct kmem_cache *gfs2_inode_cachep __read_mostly;
+struct kmem_cache *gfs2_bufdata_cachep __read_mostly;
+struct kmem_cache *gfs2_rgrpd_cachep __read_mostly;
+struct kmem_cache *gfs2_quotad_cachep __read_mostly;
 
 void gfs2_assert_i(struct gfs2_sbd *sdp)
 {
@@ -33,6 +32,40 @@ void gfs2_assert_i(struct gfs2_sbd *sdp)
               sdp->sd_fsname);
 }
 
+int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
+{
+       struct lm_lockstruct *ls = &sdp->sd_lockstruct;
+       const struct lm_lockops *lm = ls->ls_ops;
+       va_list args;
+
+       if (sdp->sd_args.ar_errors == GFS2_ERRORS_WITHDRAW &&
+           test_and_set_bit(SDF_SHUTDOWN, &sdp->sd_flags))
+               return 0;
+
+       va_start(args, fmt);
+       vprintk(fmt, args);
+       va_end(args);
+
+       if (sdp->sd_args.ar_errors == GFS2_ERRORS_WITHDRAW) {
+               fs_err(sdp, "about to withdraw this file system\n");
+               BUG_ON(sdp->sd_args.ar_debug);
+
+               kobject_uevent(&sdp->sd_kobj, KOBJ_OFFLINE);
+
+               if (lm->lm_unmount) {
+                       fs_err(sdp, "telling LM to unmount\n");
+                       lm->lm_unmount(sdp);
+               }
+               fs_err(sdp, "withdrawn\n");
+               dump_stack();
+       }
+
+       if (sdp->sd_args.ar_errors == GFS2_ERRORS_PANIC)
+               panic("GFS2: fsid=%s: panic requested.\n", sdp->sd_fsname);
+
+       return -1;
+}
+
 /**
  * gfs2_assert_withdraw_i - Cause the machine to withdraw if @assertion is false
  * Returns: -1 if this call withdrew the machine,
@@ -66,17 +99,24 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,
                        gfs2_tune_get(sdp, gt_complain_secs) * HZ))
                return -2;
 
-       printk(KERN_WARNING
-              "GFS2: fsid=%s: warning: assertion \"%s\" failed\n"
-              "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",
-              sdp->sd_fsname, assertion,
-              sdp->sd_fsname, function, file, line);
+       if (sdp->sd_args.ar_errors == GFS2_ERRORS_WITHDRAW)
+               printk(KERN_WARNING
+                      "GFS2: fsid=%s: warning: assertion \"%s\" failed\n"
+                      "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",
+                      sdp->sd_fsname, assertion,
+                      sdp->sd_fsname, function, file, line);
 
        if (sdp->sd_args.ar_debug)
                BUG();
        else
                dump_stack();
 
+       if (sdp->sd_args.ar_errors == GFS2_ERRORS_PANIC)
+               panic("GFS2: fsid=%s: warning: assertion \"%s\" failed\n"
+                     "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",
+                     sdp->sd_fsname, assertion,
+                     sdp->sd_fsname, function, file, line);
+
        sdp->sd_last_warning = jiffies;
 
        return -1;
@@ -116,8 +156,8 @@ int gfs2_consist_inode_i(struct gfs2_inode *ip, int cluster_wide,
                "GFS2: fsid=%s:   inode = %llu %llu\n"
                "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",
                sdp->sd_fsname,
-               sdp->sd_fsname, (unsigned long long)ip->i_num.no_formal_ino,
-               (unsigned long long)ip->i_num.no_addr,
+               sdp->sd_fsname, (unsigned long long)ip->i_no_formal_ino,
+               (unsigned long long)ip->i_no_addr,
                sdp->sd_fsname, function, file, line);
        return rv;
 }
@@ -138,7 +178,7 @@ int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, int cluster_wide,
                "GFS2: fsid=%s:   RG = %llu\n"
                "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",
                sdp->sd_fsname,
-               sdp->sd_fsname, (unsigned long long)rgd->rd_ri.ri_addr,
+               sdp->sd_fsname, (unsigned long long)rgd->rd_addr,
                sdp->sd_fsname, function, file, line);
        return rv;
 }
@@ -171,7 +211,7 @@ int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
  */
 
 int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
-                          uint16_t type, uint16_t t, const char *function,
+                          u16 type, u16 t, const char *function,
                           char *file, unsigned int line)
 {
        int me;