#include <linux/obd_support.h>
#include <linux/obd_class.h>
-#include <linux/obd_sim.h> /* XXX for development/debugging only */
-#include <obdfs.h>
+#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 *);
NULL /* remount_fs */
};
-struct obdfs_sb_info obdfs_super_info;
-int obd_minor = 0;
-int obd_root_ino = 2;
+static char *obdfs_read_opt(const char *opt, char *data)
+{
+ char *value;
+ char *retval;
+
+ CDEBUG(D_SUPER, "option: %s, data %s\n", opt, data);
+ if ( strncmp(opt, data, strlen(opt)) )
+ return NULL;
+
+ if ( (value = strchr(data, '=')) == NULL )
+ return NULL;
+
+ value++;
+ OBD_ALLOC(retval, char *, strlen(value) + 1);
+ if ( !retval ) {
+ printk("OBDFS: Out of memory!\n");
+ return NULL;
+ }
+
+ memcpy(retval, value, strlen(value)+1);
+ CDEBUG(D_SUPER, "Assigned option: %s, value %s\n", opt, retval);
+ return retval;
+}
+
+void obdfs_options(char *options, char **dev, char **vers)
+{
+ char *this_char;
+
+ if (!options)
+ return;
+
+ for (this_char = strtok (options, ",");
+ this_char != NULL;
+ this_char = strtok (NULL, ",")) {
+ CDEBUG(D_SUPER, "this_char %s\n", this_char);
+ if ( (!*dev && (*dev = obdfs_read_opt("device", this_char)))||
+ (!*vers && (*vers = obdfs_read_opt("version", this_char))) )
+ continue;
+
+ }
+}
+
+static int obdfs_getdev(char *devpath, int *dev)
+{
+ struct dentry *dentry;
+ kdev_t devno;
+
+ dentry = lookup_dentry(devpath, NULL, 0);
+ if (IS_ERR(dentry))
+ return PTR_ERR(dentry);
+
+ if (!S_ISCHR(dentry->d_inode->i_mode))
+ return -ENODEV;
+
+ devno = dentry->d_inode->i_rdev;
+ if ( MAJOR(devno) != OBD_PSDEV_MAJOR )
+ return -ENODEV;
+
+ if ( MINOR(devno) >= MAX_OBD_DEVICES )
+ return -ENODEV;
+
+ *dev = devno;
+ return 0;
+}
static struct super_block * obdfs_read_super(struct super_block *sb,
void *data, int silent)
{
struct inode *root = 0;
- struct obdfs_sb_info *sbi = NULL;
+ struct obdfs_sb_info *sbi = (struct obdfs_sb_info *)(&sb->u.generic_sbp);
+ struct obd_device *obddev;
int error = 0;
+ char *device = NULL;
+ char *version = NULL;
+ int devno;
+ int err;
+ unsigned long blocksize;
+ unsigned long blocksize_bits;
+ unsigned long root_ino;
+ int scratch;
+
ENTRY;
MOD_INC_USE_COUNT;
+
+ memset(sbi, 0, sizeof(*sbi));
+
+ obdfs_options(data, &device, &version);
+ if ( !device ) {
+ printk("No device\n");
+ MOD_DEC_USE_COUNT;
+ EXIT;
+ return NULL;
+ }
- sbi = &obdfs_super_info;
+ if ( (err = obdfs_getdev(device, &devno)) ) {
+ printk("Cannot get devno of %s, error %d\n", device, err);
+ MOD_DEC_USE_COUNT;
+ EXIT;
+ return NULL;
+ }
- if ( sbi->osi_super ) {
- printk("Already mounted\n");
+ if ( MAJOR(devno) != OBD_PSDEV_MAJOR ) {
+ printk("Wrong major number!\n");
MOD_DEC_USE_COUNT;
+ EXIT;
return NULL;
}
+
+ if ( MINOR(devno) >= MAX_OBD_DEVICES ) {
+ printk("Minor of %s too high (%d)\n", device, MINOR(devno));
+ MOD_DEC_USE_COUNT;
+ EXIT;
+ return NULL;
+ }
- sbi->osi_obd = &obd_dev[obd_minor];
+ obddev = &obd_dev[MINOR(devno)];
+
+ if ( ! (obddev->obd_flags & OBD_ATTACHED) ||
+ ! (obddev->obd_flags & OBD_SET_UP) ){
+ printk("Device %s not attached or not set up (%d)\n",
+ device, MINOR(devno));
+ MOD_DEC_USE_COUNT;
+ EXIT;
+ return NULL;
+ }
+
+ sbi->osi_obd = obddev;
sbi->osi_ops = sbi->osi_obd->obd_type->typ_ops;
- error = sbi->osi_ops->o_connect(obd_minor, &sbi->osi_conn_info);
+ sbi->osi_conn.oc_dev = obddev;
+ error = sbi->osi_ops->o_connect(&sbi->osi_conn);
if ( error ) {
- printk("OBDFS: cannot connect to 0x%x.\n", obd_minor);
+ printk("OBDFS: cannot connect to %s\n", device);
goto error;
}
+
+
sbi->osi_super = sb;
+ error = sbi->osi_ops->o_get_info(&sbi->osi_conn,
+ 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,
+ 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,
+ 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, rootino: %ld, dev %s, "
+ "minor: %d, blocksize: %ld, blocksize bits %ld\n",
+ sb->s_dev, root->i_ino, device, MINOR(devno),
+ blocksize, blocksize_bits);
sb->s_root = d_alloc_root(root);
unlock_super(sb);
EXIT;
sb->s_dev = 0;
/* XXX flush stuff */
- sbi = sb->u.generic_sbp;
- sb->u.generic_sbp = NULL;
- sbi->osi_ops->o_disconnect(sbi->osi_conn_info.conn_id);
- sbi->osi_super = NULL;
+ sbi = (struct obdfs_sb_info *) &sb->u.generic_sbp;
+
+ OPS(sb,disconnect)(ID(sb));
+ memset(sbi, 0, sizeof(* sbi));
printk("OBDFS: Bye bye.\n");
- memset(sbi, 0, sizeof(* sbi));
MOD_DEC_USE_COUNT;
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 = sbi->osi_ops->o_getattr(sbi->osi_conn_info.conn_id,
- inode->i_ino, &attr);
+ error = IOPS(inode, getattr)(IID(inode), 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);
+ CDEBUG(D_INODE, "ino %ld, COWFL %x\n", inode->i_ino, inode->i_flags & 0x0010000);
+ 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;
- inode_to_iattr(inode, &attr);
- sbi = inode->i_sb->u.generic_sbp;
- error = sbi->osi_ops->o_setattr(sbi->osi_conn_info.conn_id,
- inode->i_ino, &attr);
+ error = IOPS(inode, setattr)(IID(inode), inode);
if (error) {
- printk("obdfs_write_inode: ibd_setattr fails (%d)\n", error);
+ printk("obdfs_write_inode: obd_setattr fails (%d)\n", error);
return;
}
-
+
return;
}
static void obdfs_delete_inode(struct inode *inode)
{
- struct obdfs_sb_info *sbi;
int error;
ENTRY;
- sbi = inode->i_sb->u.generic_sbp;
- error = sbi->osi_ops->o_destroy(sbi->osi_conn_info.conn_id,
- inode->i_ino);
+ error = IOPS(inode, destroy)(IID(inode), inode);
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 obdfs_sb_info * sbi;
+ struct iattr saved_copy;
int error;
ENTRY;
+ inode_to_iattr(inode, &saved_copy);
- sbi = inode->i_sb->u.generic_sbp;
- error = sbi->osi_ops->o_setattr(sbi->osi_conn_info.conn_id,
- inode->i_ino, iattr);
+ inode_setattr(inode, iattr);
+ error = IOPS(inode, setattr)(IID(inode), 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);
}
+
+ CDEBUG(D_INODE, "inode blocks now %ld\n", inode->i_blocks);
EXIT;
return error;
}
int bufsize)
{
struct statfs tmp;
- struct obdfs_sb_info * sbi;
int error;
ENTRY;
- sbi = sb->u.generic_sbp;
- error = sbi->osi_ops->o_statfs(sbi->osi_conn_info.conn_id, &tmp);
+ error = OPS(sb,statfs)(ID(sb), &tmp);
if ( error ) {
printk("obdfs_notify_change: obd_statfs fails (%d)\n", error);
return error;
obdfs_sysctl_init();
- obd_sbi = &obdfs_super_info;
- obd_fso = &obdfs_file_operations;
-
return register_filesystem(&obdfs_fs_type);
}
obdfs_sysctl_clean();
unregister_filesystem(&obdfs_fs_type);
}
-void obdfs_psdev_dec_use_count(void)
-{
- MOD_DEC_USE_COUNT;
-}
-
-EXPORT_SYMBOL(obdfs_psdev_dec_use_count);
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff