* OBDFS Super operations
*
* Copryright (C) 1996 Peter J. Braam <braam@stelias.com>
+ * Copryright (C) 1999 Stelias Computing Inc. <braam@stelias.com>
+ * Copryright (C) 1999 Seagate Technology Inc.
+ *
*/
#define EXPORT_SYMTAB
#include <linux/vmalloc.h>
#include <asm/segment.h>
-#include <../obd/linux/sim_obd.h>
-#include <obdfs.h>
+#include <linux/obd_support.h>
+#include <linux/obd_class.h>
+#include <linux/obd_sim.h> /* XXX for development/debugging only */
+#include <linux/obdfs.h>
/* VFS super_block ops */
static struct super_block *obdfs_read_super(struct super_block *, void *, int);
-static void obdfs_read_inode(struct inode *);
static int obdfs_notify_change(struct dentry *dentry, struct iattr *attr);
static void obdfs_write_inode(struct inode *);
static void obdfs_delete_inode(struct inode *);
{
struct inode *root = 0;
struct obdfs_sb_info *sbi = NULL;
+ struct obd_device *obddev;
int error = 0;
+ unsigned long blocksize;
+ unsigned long blocksize_bits;
+ unsigned long root_ino;
+ int scratch;
+
ENTRY;
MOD_INC_USE_COUNT;
MOD_DEC_USE_COUNT;
return NULL;
}
+
+ obddev = &obd_dev[obd_minor];
+
+ if ( ! (obddev->obd_flags & OBD_ATTACHED) ||
+ ! (obddev->obd_flags & OBD_SET_UP) )
+ return NULL;
- error = obd_connect(obd_minor, &sbi->osi_conn_info);
+ sbi->osi_obd = obddev;
+ sbi->osi_ops = sbi->osi_obd->obd_type->typ_ops;
+
+ error = sbi->osi_ops->o_connect(sbi->osi_obd, &sbi->osi_conn_info);
if ( error ) {
printk("OBDFS: cannot connect to 0x%x.\n", obd_minor);
goto error;
}
+
sbi->osi_super = sb;
+ error = sbi->osi_ops->o_get_info(sbi->osi_conn_info.conn_id,
+ strlen("blocksize"),
+ "blocksize",
+ &scratch, (void *)&blocksize);
+ if ( error ) {
+ printk("Getinfo call to drive failed (blocksize)\n");
+ goto error;
+ }
+
+ error = sbi->osi_ops->o_get_info(sbi->osi_conn_info.conn_id,
+ strlen("blocksize_bits"),
+ "blocksize_bits",
+ &scratch, (void *)&blocksize_bits);
+ if ( error ) {
+ printk("Getinfo call to drive failed (blocksize_bits)\n");
+ goto error;
+ }
+
+ error = sbi->osi_ops->o_get_info(sbi->osi_conn_info.conn_id,
+ strlen("root_ino"),
+ "root_ino",
+ &scratch, (void *)&root_ino);
+ if ( error ) {
+ printk("Getinfo call to drive failed (root_ino)\n");
+ goto error;
+ }
+
+
+
lock_super(sb);
sb->u.generic_sbp = sbi;
- sb->s_blocksize = sbi->osi_conn_info.conn_blocksize;
- sb->s_blocksize_bits = sbi->osi_conn_info.conn_blocksize_bits;
+
+ sb->s_blocksize = blocksize;
+ sb->s_blocksize_bits = (unsigned char)blocksize_bits;
sb->s_magic = OBDFS_SUPER_MAGIC;
sb->s_op = &obdfs_super_operations;
/* make root inode */
- root = iget(sb, sbi->osi_conn_info.conn_ino);
+ root = iget(sb, root_ino);
if (!root || is_bad_inode(root)) {
printk("OBDFS: bad iget for root\n");
sb->s_dev = 0;
unlock_super(sb);
goto error;
}
+
- printk("obdfs_read_super: rootinode is %ld dev %d\n",
- root->i_ino, root->i_dev);
+ printk("obdfs_read_super: sbdev %d, rootinode is %ld dev %d, blocksize %ld, "
+ "blocksize bits %ld\n",
+ sb->s_dev, root->i_ino, root->i_dev, blocksize, blocksize_bits);
sb->s_root = d_alloc_root(root);
unlock_super(sb);
EXIT;
/* XXX flush stuff */
sbi = sb->u.generic_sbp;
sb->u.generic_sbp = NULL;
- obd_disconnect(sbi->osi_conn_info.conn_id);
+ sbi->osi_ops->o_disconnect(sbi->osi_conn_info.conn_id);
sbi->osi_super = NULL;
EXIT;
}
+extern struct inode_operations obdfs_inode_ops;
+
/* all filling in of inodes postponed until lookup */
-static void obdfs_read_inode(struct inode *inode)
+void obdfs_read_inode(struct inode *inode)
{
- struct iattr attr;
int error;
struct obdfs_sb_info *sbi = inode->i_sb->u.generic_sbp;
ENTRY;
- error = obd_getattr(sbi->osi_conn_info.conn_id, inode->i_ino, &attr);
+ error = sbi->osi_ops->o_getattr(sbi->osi_conn_info.conn_id,
+ inode->i_ino, inode);
if (error) {
- printk("obdfs_read_inode: ibd_getattr fails (%d)\n", error);
+ printk("obdfs_read_inode: obd_getattr fails (%d)\n", error);
return;
}
- inode_setattr(inode, &attr);
- inode->i_op = NULL;
+ IDEBUG(inode);
+ inode->i_op = &obdfs_inode_ops;
return;
}
-static void inode_to_iattr(struct inode *inode, struct iattr *tmp)
-{
- tmp->ia_mode = inode->i_mode;
- tmp->ia_uid = inode->i_uid;
- tmp->ia_gid = inode->i_gid;
- tmp->ia_size = inode->i_size;
- tmp->ia_atime = inode->i_atime;
- tmp->ia_mtime = inode->i_mtime;
- tmp->ia_ctime = inode->i_ctime;
- tmp->ia_attr_flags = inode->i_flags;
-
- tmp->ia_valid = ~0;
-}
-
static void obdfs_write_inode(struct inode *inode)
{
struct obdfs_sb_info *sbi;
- struct iattr attr;
int error;
- ENTRY;
- inode_to_iattr(inode, &attr);
sbi = inode->i_sb->u.generic_sbp;
- error = obd_setattr(sbi->osi_conn_info.conn_id, inode->i_ino, &attr);
+ error = sbi->osi_ops->o_setattr(sbi->osi_conn_info.conn_id,
+ inode->i_ino, inode);
if (error) {
- printk("obdfs_write_inode: ibd_setattr fails (%d)\n", error);
+ printk("obdfs_write_inode: obd_setattr fails (%d)\n", error);
return;
}
ENTRY;
sbi = inode->i_sb->u.generic_sbp;
- error = obd_destroy(sbi->osi_conn_info.conn_id , inode->i_ino);
+ error = sbi->osi_ops->o_destroy(sbi->osi_conn_info.conn_id,
+ inode->i_ino);
if (error) {
printk("obdfs_delete_node: ibd_destroy fails (%d)\n", error);
return;
static int obdfs_notify_change(struct dentry *de, struct iattr *iattr)
{
struct inode *inode = de->d_inode;
+ struct iattr saved_copy;
struct obdfs_sb_info * sbi;
int error;
ENTRY;
+ inode_to_iattr(inode, &saved_copy);
sbi = inode->i_sb->u.generic_sbp;
- error = obd_setattr(sbi->osi_conn_info.conn_id, inode->i_ino, iattr);
+ inode_setattr(inode, iattr);
+ error = sbi->osi_ops->o_setattr(sbi->osi_conn_info.conn_id,
+ inode->i_ino, inode);
if ( error ) {
+ inode_setattr(inode, &saved_copy);
printk("obdfs_notify_change: obd_setattr fails (%d)\n", error);
return error;
- } else {
- inode_setattr(inode, iattr);
}
EXIT;
return error;
ENTRY;
sbi = sb->u.generic_sbp;
- error = obd_statfs(sbi->osi_conn_info.conn_id, &tmp);
+ error = sbi->osi_ops->o_statfs(sbi->osi_conn_info.conn_id, &tmp);
if ( error ) {
printk("obdfs_notify_change: obd_statfs fails (%d)\n", error);
return error;
printk(KERN_INFO "OBDFS v0.1, braam@stelias.com\n");
obdfs_sysctl_init();
+
+ obd_sbi = &obdfs_super_info;
+ obd_fso = &obdfs_file_ops;
+
return register_filesystem(&obdfs_fs_type);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff