Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6] / fs / gfs2 / ops_super.c

diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
index 5f5fc3c42907a1b5d3df4b242ee740cfcbd931a6..06f06f7773d044f01ed58e5eaab893fc1051fc15 100644 (file)
--- a/fs/gfs2/ops_super.c
+++ b/fs/gfs2/ops_super.c
@@ -4,7 +4,7 @@
  *
  * 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 v.2.
+ * of the GNU General Public License version 2.
  */
 
 #include <linux/sched.h>
@@ -13,16 +13,15 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/statfs.h>
-#include <linux/vmalloc.h>
 #include <linux/seq_file.h>
 #include <linux/mount.h>
 #include <linux/kthread.h>
 #include <linux/delay.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
+#include <linux/lm_interface.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "glock.h"
 #include "inode.h"
@@ -30,7 +29,6 @@
 #include "log.h"
 #include "mount.h"
 #include "ops_super.h"
-#include "page.h"
 #include "quota.h"
 #include "recovery.h"
 #include "rgrp.h"
@@ -55,7 +53,7 @@ static int gfs2_write_inode(struct inode *inode, int sync)
        struct gfs2_inode *ip = GFS2_I(inode);
 
        /* Check this is a "normal" inode */
-       if (inode->u.generic_ip) {
+       if (inode->i_private) {
                if (current->flags & PF_MEMALLOC)
                        return 0;
                if (sync)
@@ -79,6 +77,9 @@ static void gfs2_put_super(struct super_block *sb)
        if (!sdp)
                return;
 
+       if (!strncmp(sb->s_type->name, "gfs2meta", 8))
+               return; /* Nothing to do */
+
        /*  Unfreeze the filesystem, if we need to  */
 
        mutex_lock(&sdp->sd_freeze_lock);
@@ -133,8 +134,7 @@ static void gfs2_put_super(struct super_block *sb)
 
        /*  At this point, we're through participating in the lockspace  */
        gfs2_sys_fs_del(sdp);
-       vfree(sdp);
-       sb->s_fs_info = NULL;
+       kfree(sdp);
 }
 
 /**
@@ -147,8 +147,7 @@ static void gfs2_put_super(struct super_block *sb)
 
 static void gfs2_write_super(struct super_block *sb)
 {
-       struct gfs2_sbd *sdp = sb->s_fs_info;
-       gfs2_log_flush(sdp, NULL);
+       gfs2_log_flush(sb->s_fs_info, NULL);
 }
 
 /**
@@ -190,8 +189,7 @@ static void gfs2_write_super_lockfs(struct super_block *sb)
 
 static void gfs2_unlockfs(struct super_block *sb)
 {
-       struct gfs2_sbd *sdp = sb->s_fs_info;
-       gfs2_unfreeze_fs(sdp);
+       gfs2_unfreeze_fs(sb->s_fs_info);
 }
 
 /**
@@ -202,8 +200,9 @@ static void gfs2_unlockfs(struct super_block *sb)
  * Returns: 0 on success or error code
  */
 
-static int gfs2_statfs(struct super_block *sb, struct kstatfs *buf)
+static int gfs2_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
+       struct super_block *sb = dentry->d_inode->i_sb;
        struct gfs2_sbd *sdp = sb->s_fs_info;
        struct gfs2_statfs_change sc;
        int error;
@@ -216,8 +215,6 @@ static int gfs2_statfs(struct super_block *sb, struct kstatfs *buf)
        if (error)
                return error;
 
-       memset(buf, 0, sizeof(struct kstatfs));
-
        buf->f_type = GFS2_MAGIC;
        buf->f_bsize = sdp->sd_sb.sb_bsize;
        buf->f_blocks = sc.sc_total;
@@ -283,7 +280,7 @@ static void gfs2_clear_inode(struct inode *inode)
         * serves to contain an address space (see rgrp.c, meta_io.c)
         * which therefore doesn't have its own glocks.
         */
-       if (inode->u.generic_ip) {
+       if (inode->i_private) {
                struct gfs2_inode *ip = GFS2_I(inode);
                gfs2_glock_inode_squish(inode);
                gfs2_assert(inode->i_sb->s_fs_info, ip->i_gl->gl_state == LM_ST_UNLOCKED);
@@ -370,7 +367,7 @@ static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt)
        return 0;
 }
 
-/* 
+/*
  * We have to (at the moment) hold the inodes main lock to cover
  * the gap between unlocking the shared lock on the iopen lock and
  * taking the exclusive lock. I'd rather do a shared -> exclusive
@@ -384,7 +381,7 @@ static void gfs2_delete_inode(struct inode *inode)
        struct gfs2_holder gh;
        int error;
 
-       if (!inode->u.generic_ip)
+       if (!inode->i_private)
                goto out;
 
        error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, LM_FLAG_TRY_1CB | GL_NOCACHE, &gh);