*
* 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>
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/buffer_head.h>
-#include <linux/vmalloc.h>
#include <linux/blkdev.h>
#include <linux/kthread.h>
#include <linux/namei.h>
#include <linux/mount.h>
#include <linux/gfs2_ondisk.h>
+#include <linux/lm_interface.h>
#include "gfs2.h"
-#include "lm_interface.h"
#include "incore.h"
#include "daemon.h"
#include "glock.h"
static struct gfs2_sbd *init_sbd(struct super_block *sb)
{
struct gfs2_sbd *sdp;
- unsigned int x;
- sdp = vmalloc(sizeof(struct gfs2_sbd));
+ sdp = kzalloc(sizeof(struct gfs2_sbd), GFP_KERNEL);
if (!sdp)
return NULL;
- memset(sdp, 0, sizeof(struct gfs2_sbd));
-
sb->s_fs_info = sdp;
sdp->sd_vfs = sb;
gfs2_tune_init(&sdp->sd_tune);
- for (x = 0; x < GFS2_GL_HASH_SIZE; x++) {
- rwlock_init(&sdp->sd_gl_hash[x].hb_lock);
- INIT_LIST_HEAD(&sdp->sd_gl_hash[x].hb_list);
- }
INIT_LIST_HEAD(&sdp->sd_reclaim_list);
spin_lock_init(&sdp->sd_reclaim_lock);
init_waitqueue_head(&sdp->sd_reclaim_wq);
static int init_names(struct gfs2_sbd *sdp, int silent)
{
- struct gfs2_sb *sb = NULL;
+ struct page *page;
char *proto, *table;
int error = 0;
/* Try to autodetect */
if (!proto[0] || !table[0]) {
- struct buffer_head *bh;
- bh = sb_getblk(sdp->sd_vfs,
- GFS2_SB_ADDR >> sdp->sd_fsb2bb_shift);
- lock_buffer(bh);
- clear_buffer_uptodate(bh);
- clear_buffer_dirty(bh);
- unlock_buffer(bh);
- ll_rw_block(READ, 1, &bh);
- wait_on_buffer(bh);
-
- if (!buffer_uptodate(bh)) {
- brelse(bh);
- return -EIO;
- }
-
- sb = kmalloc(sizeof(struct gfs2_sb), GFP_KERNEL);
- if (!sb) {
- brelse(bh);
- return -ENOMEM;
- }
- gfs2_sb_in(sb, bh->b_data);
- brelse(bh);
-
- error = gfs2_check_sb(sdp, sb, silent);
+ struct gfs2_sb *sb;
+ page = gfs2_read_super(sdp->sd_vfs, GFS2_SB_ADDR >> sdp->sd_fsb2bb_shift);
+ if (!page)
+ return -ENOBUFS;
+ sb = kmap(page);
+ gfs2_sb_in(&sdp->sd_sb, sb);
+ kunmap(page);
+ __free_page(page);
+
+ error = gfs2_check_sb(sdp, &sdp->sd_sb, silent);
if (error)
goto out;
if (!proto[0])
- proto = sb->sb_lockproto;
+ proto = sdp->sd_sb.sb_lockproto;
if (!table[0])
- table = sb->sb_locktable;
+ table = sdp->sd_sb.sb_locktable;
}
if (!table[0])
snprintf(sdp->sd_proto_name, GFS2_FSNAME_LEN, "%s", proto);
snprintf(sdp->sd_table_name, GFS2_FSNAME_LEN, "%s", table);
- out:
- kfree(sb);
-
+out:
return error;
}
fail_trans:
gfs2_glock_put(sdp->sd_trans_gl);
-
fail_rename:
gfs2_glock_put(sdp->sd_rename_gl);
-
fail_live:
gfs2_glock_dq_uninit(&sdp->sd_live_gh);
-
fail_mount:
gfs2_glock_dq_uninit(mount_gh);
-
fail:
while (sdp->sd_glockd_num--)
kthread_stop(sdp->sd_glockd_process[sdp->sd_glockd_num]);
kthread_stop(sdp->sd_scand_process);
-
return error;
}
static struct inode *gfs2_lookup_root(struct super_block *sb,
- struct gfs2_inum *inum)
+ struct gfs2_inum_host *inum)
{
return gfs2_inode_lookup(sb, inum, DT_DIR);
}
{
struct super_block *sb = sdp->sd_vfs;
struct gfs2_holder sb_gh;
- struct gfs2_inum *inum;
+ struct gfs2_inum_host *inum;
struct inode *inode;
int error = 0;
}
return 0;
}
-
+
error = gfs2_glock_nq_num(sdp, GFS2_SB_LOCK, &gfs2_meta_glops,
LM_ST_SHARED, 0, &sb_gh);
if (error) {
error = -EINVAL;
if (!gfs2_jindex_size(sdp)) {
fs_err(sdp, "no journals!\n");
- goto fail_jindex;
+ goto fail_jindex;
}
if (sdp->sd_args.ar_spectator) {
return 0;
- fail_recoverd:
+fail_recoverd:
kthread_stop(sdp->sd_recoverd_process);
-
- fail_jinode_gh:
+fail_jinode_gh:
if (!sdp->sd_args.ar_spectator)
gfs2_glock_dq_uninit(&sdp->sd_jinode_gh);
-
- fail_journal_gh:
+fail_journal_gh:
if (!sdp->sd_args.ar_spectator)
gfs2_glock_dq_uninit(&sdp->sd_journal_gh);
-
- fail_jindex:
+fail_jindex:
gfs2_jindex_free(sdp);
if (jindex)
gfs2_glock_dq_uninit(&ji_gh);
-
- fail:
+fail:
iput(sdp->sd_jindex);
-
return error;
}
fail_qinode:
iput(sdp->sd_quota_inode);
-
fail_rindex:
gfs2_clear_rgrpd(sdp);
iput(sdp->sd_rindex);
-
fail_statfs:
iput(sdp->sd_statfs_inode);
-
fail_inum:
iput(sdp->sd_inum_inode);
fail_journal:
return 0;
- fail_qc_gh:
+fail_qc_gh:
gfs2_glock_dq_uninit(&sdp->sd_qc_gh);
-
- fail_ut_gh:
-
+fail_ut_gh:
gfs2_glock_dq_uninit(&sdp->sd_sc_gh);
-
- fail_ir_gh:
+fail_ir_gh:
gfs2_glock_dq_uninit(&sdp->sd_ir_gh);
-
- fail_qc_i:
+fail_qc_i:
iput(sdp->sd_qc_inode);
-
- fail_ut_i:
-
+fail_ut_i:
iput(sdp->sd_sc_inode);
-
- fail_ir_i:
+fail_ir_i:
iput(sdp->sd_ir_inode);
-
- fail:
+fail:
if (pn)
iput(pn);
return error;
return 0;
- fail_threads:
+fail_threads:
init_threads(sdp, UNDO);
-
- fail_per_node:
+fail_per_node:
init_per_node(sdp, UNDO);
-
- fail_inodes:
+fail_inodes:
init_inodes(sdp, UNDO);
-
- fail_sb:
+fail_sb:
init_sb(sdp, 0, UNDO);
-
- fail_locking:
+fail_locking:
init_locking(sdp, &mount_gh, UNDO);
-
- fail_lm:
+fail_lm:
gfs2_gl_hash_clear(sdp, WAIT);
gfs2_lm_unmount(sdp);
while (invalidate_inodes(sb))
yield();
-
- fail_sys:
+fail_sys:
gfs2_sys_fs_del(sdp);
-
- fail:
- vfree(sdp);
+fail:
+ kfree(sdp);
sb->s_fs_info = NULL;
-
return error;
}
if (error)
goto out;
sb = mnt->mnt_sb;
- sdp = (struct gfs2_sbd*)sb->s_fs_info;
+ sdp = sb->s_fs_info;
sdp->sd_gfs2mnt = mnt;
out:
return error;
}
-static int fill_super_meta(struct super_block *sb, struct super_block *new,
+static int fill_super_meta(struct super_block *sb, struct super_block *new,
void *data, int silent)
{
struct gfs2_sbd *sdp = sb->s_fs_info;
fs_err(sdp, "can't get root dentry\n");
error = -ENOMEM;
iput(inode);
- }
- new->s_root->d_op = &gfs2_dops;
+ } else
+ new->s_root->d_op = &gfs2_dops;
return error;
}
+
static int set_bdev_super(struct super_block *s, void *data)
{
s->s_bdev = data;
s->s_dev = s->s_bdev->bd_dev;
return 0;
}
-
+
static int test_bdev_super(struct super_block *s, void *data)
{
- return (void *)s->s_bdev == data;
+ return s->s_bdev == data;
}
static struct super_block* get_gfs2_sb(const char *dev_name)
struct super_block *sb = NULL, *s;
struct list_head *l;
int error;
-
+
error = path_lookup(dev_name, LOOKUP_FOLLOW, &nd);
if (error) {
- printk(KERN_WARNING "GFS2: path_lookup on %s returned error\n",
+ printk(KERN_WARNING "GFS2: path_lookup on %s returned error\n",
dev_name);
goto out;
}
int error = 0;
struct super_block *sb = NULL, *new;
struct gfs2_sbd *sdp;
- char *gfs2mnt = NULL;
sb = get_gfs2_sb(dev_name);
if (!sb) {
error = -EBUSY;
goto error;
}
- mutex_lock(&sb->s_bdev->bd_mount_mutex);
+ down(&sb->s_bdev->bd_mount_sem);
new = sget(fs_type, test_bdev_super, set_bdev_super, sb->s_bdev);
- mutex_unlock(&sb->s_bdev->bd_mount_mutex);
+ up(&sb->s_bdev->bd_mount_sem);
if (IS_ERR(new)) {
error = PTR_ERR(new);
goto error;
deactivate_super(new);
goto error;
}
-
+
new->s_flags |= MS_ACTIVE;
-
+
/* Grab a reference to the gfs2 mount point */
atomic_inc(&sdp->sd_gfs2mnt->mnt_count);
return simple_set_mnt(mnt, new);
error:
- if (gfs2mnt)
- kfree(gfs2mnt);
return error;
}