#include <linux/obd_class.h>
#include <linux/obdfs.h>
-/* VFS super_block ops */
-static struct super_block *obdfs_read_super(struct super_block *, void *, int);
-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 *);
-static void obdfs_put_super(struct super_block *);
-static int obdfs_statfs(struct super_block *sb, struct statfs *buf,
- int bufsiz);
-
-/* exported operations */
-struct super_operations obdfs_super_operations =
-{
- obdfs_read_inode, /* read_inode */
- obdfs_write_inode, /* write_inode */
- NULL, /* put_inode */
- obdfs_delete_inode, /* delete_inode */
- obdfs_notify_change, /* notify_change */
- obdfs_put_super, /* put_super */
- NULL, /* write_super */
- obdfs_statfs, /* statfs */
- NULL /* remount_fs */
-};
-
struct list_head obdfs_super_list;
+struct super_operations obdfs_super_operations;
+long obdfs_cache_count = 0;
+long obdfs_mutex_start = 0;
+long obd_memory = 0;
static char *obdfs_read_opt(const char *opt, char *data)
{
char *value;
char *retval;
- CDEBUG(D_SUPER, "option: %s, data %s\n", opt, data);
+ CDEBUG(D_INFO, "option: %s, data %s\n", opt, data);
if ( strncmp(opt, data, strlen(opt)) )
return NULL;
value++;
OBD_ALLOC(retval, char *, strlen(value) + 1);
if ( !retval ) {
- printk("OBDFS: Out of memory!\n");
+ printk(KERN_ALERT __FUNCTION__ ": out of memory!\n");
return NULL;
}
memcpy(retval, value, strlen(value)+1);
- CDEBUG(D_SUPER, "Assigned option: %s, value %s\n", opt, retval);
+ CDEBUG(D_PSDEV, "Assigned option: %s, value %s\n", opt, retval);
return retval;
}
-void obdfs_options(char *options, char **dev, char **vers)
+static void obdfs_options(char *options, char **dev, char **vers)
{
char *this_char;
for (this_char = strtok (options, ",");
this_char != NULL;
this_char = strtok (NULL, ",")) {
- CDEBUG(D_SUPER, "this_char %s\n", this_char);
+ CDEBUG(D_INFO, "this_char %s\n", this_char);
if ( (!*dev && (*dev = obdfs_read_opt("device", this_char)))||
(!*vers && (*vers = obdfs_read_opt("version", this_char))) )
continue;
}
-/* XXX allocate a super_entry, and add the super to the obdfs_super_list */
static struct super_block * obdfs_read_super(struct super_block *sb,
void *data, int silent)
{
obdfs_options(data, &device, &version);
if ( !device ) {
- printk("No device\n");
- MOD_DEC_USE_COUNT;
+ printk(__FUNCTION__ ": no device\n");
EXIT;
- return NULL;
+ goto ERR;
}
if ( (err = obdfs_getdev(device, &devno)) ) {
printk("Cannot get devno of %s, error %d\n", device, err);
- MOD_DEC_USE_COUNT;
EXIT;
- return NULL;
+ goto ERR;;
}
if ( MAJOR(devno) != OBD_PSDEV_MAJOR ) {
- printk("Wrong major number!\n");
- MOD_DEC_USE_COUNT;
+ printk(__FUNCTION__ ": wrong major number %d!\n", MAJOR(devno));
EXIT;
- return NULL;
+ goto ERR;
}
if ( MINOR(devno) >= MAX_OBD_DEVICES ) {
- printk("Minor of %s too high (%d)\n", device, MINOR(devno));
- MOD_DEC_USE_COUNT;
+ printk(__FUNCTION__ ": minor of %s too high (%d)\n",
+ device, MINOR(devno));
EXIT;
- return NULL;
+ goto ERR;
}
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",
+ printk("device %s not attached or not set up (%d)\n",
device, MINOR(devno));
- MOD_DEC_USE_COUNT;
EXIT;
- return NULL;
+ goto ERR;;
}
sbi->osi_obd = obddev;
err = sbi->osi_ops->o_connect(&sbi->osi_conn);
if ( err ) {
printk("OBDFS: cannot connect to %s\n", device);
+ EXIT;
goto ERR;
}
"blocksize", &scratch,
(void *)&blocksize);
if ( err ) {
- printk("Getinfo call to drive failed (blocksize)\n");
+ printk("getinfo call to drive failed (blocksize)\n");
+ EXIT;
goto ERR;
}
"blocksize_bits", &scratch,
(void *)&blocksize_bits);
if ( err ) {
- printk("Getinfo call to drive failed (blocksize_bits)\n");
+ printk("getinfo call to drive failed (blocksize_bits)\n");
+ EXIT;
goto ERR;
}
err = sbi->osi_ops->o_get_info(&sbi->osi_conn, strlen("root_ino"),
"root_ino", &scratch, (void *)&root_ino);
if ( err ) {
- printk("Getinfo call to drive failed (root_ino)\n");
+ printk("getinfo call to drive failed (root_ino)\n");
+ EXIT;
goto ERR;
}
sb->s_dev = 0;
err = -ENOENT;
unlock_super(sb);
+ EXIT;
goto ERR;
}
- printk("obdfs_read_super: sbdev %d, rootino: %ld, dev %s, "
+ CDEBUG(D_INFO, "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);
list_add(&sbi->osi_list, &obdfs_super_list);
unlock_super(sb);
+ OBD_FREE(device, strlen(device) + 1);
+ if (version)
+ OBD_FREE(version, strlen(version) + 1);
EXIT;
return sb;
ERR:
- EXIT;
MOD_DEC_USE_COUNT;
+ if (device)
+ OBD_FREE(device, strlen(device) + 1);
+ if (version)
+ OBD_FREE(version, strlen(version) + 1);
if (sbi) {
sbi->osi_super = NULL;
}
}
sb->s_dev = 0;
return NULL;
-}
+} /* obdfs_read_super */
static void obdfs_put_super(struct super_block *sb)
sb->s_dev = 0;
sbi = (struct obdfs_sb_info *) &sb->u.generic_sbp;
- obdfs_flush_reqs(&sbi->osi_inodes, 0);
+ obdfs_flush_reqs(&sbi->osi_inodes, ~0UL);
OPS(sb,disconnect)(ID(sb));
list_del(&sbi->osi_list);
memset(sbi, 0, sizeof(*sbi));
- printk("OBDFS: Bye bye.\n");
+ printk(KERN_INFO "OBDFS: Bye bye.\n");
MOD_DEC_USE_COUNT;
EXIT;
/* all filling in of inodes postponed until lookup */
-void obdfs_read_inode(struct inode *inode)
+static void obdfs_read_inode(struct inode *inode)
{
struct obdo *oa;
oa = obdo_fromid(IID(inode), inode->i_ino,
OBD_MD_FLNOTOBD | OBD_MD_FLBLOCKS);
if ( IS_ERR(oa) ) {
- printk("obdfs_read_inode: obdo_fromid failed\n");
+ printk(__FUNCTION__ ": obdo_fromid failed\n");
EXIT;
return /* PTR_ERR(oa) */;
}
INIT_LIST_HEAD(obdfs_iplist(inode)); /* list of dirty pages on inode */
INIT_LIST_HEAD(obdfs_islist(inode)); /* list of inodes in superblock */
-
obdo_free(oa);
/* OIDEBUG(inode); */
inode->i_op = &obdfs_dir_inode_operations;
EXIT;
} else if (S_ISLNK(inode->i_mode)) {
- inode->i_op = &obdfs_symlink_inode_operations;
+ inode->i_op = inode->i_blocks
+ ?&obdfs_symlink_inode_operations
+ :&obdfs_fast_symlink_inode_operations;
EXIT;
} else {
init_special_inode(inode, inode->i_mode,
- /* XXX need to fill in the ext2 side */
- ((long *)obdfs_i2info(inode)->oi_inline)[0]);
+ ((int *)obdfs_i2info(inode)->oi_inline)[0]);
}
return;
int err;
ENTRY;
+ if (IOPS(inode, setattr) == NULL) {
+ printk(KERN_ERR __FUNCTION__ ": no setattr method!\n");
+ EXIT;
+ return;
+ }
oa = obdo_alloc();
if ( !oa ) {
- printk("obdfs_write_inode: obdo_alloc failed\n");
+ printk(__FUNCTION__ ": obdo_alloc failed\n");
+ EXIT;
return;
}
obdfs_from_inode(oa, inode);
err = IOPS(inode, setattr)(IID(inode), oa);
- if ( err ) {
- printk("obdfs_write_inode: obd_setattr fails (%d)\n", err);
- EXIT;
- } else {
- /* Copy back attributes from oa, as there may have been
- * changes at the target (e.g. obdo becomes a redirector
- * in the snapshot layer).
- */
- obdfs_to_inode(inode, oa);
- EXIT;
- }
+ if ( err )
+ printk(__FUNCTION__ ": obd_setattr fails (%d)\n", err);
+ EXIT;
obdo_free(oa);
} /* obdfs_write_inode */
+/* This routine is called from iput() (for each unlink on the inode).
+ * We can't put this call into delete_inode() since that is called only
+ * when i_count == 0, and we need to keep a reference on the inode while
+ * it is in the page cache, which means i_count > 0. Catch 22.
+ */
+static void obdfs_put_inode(struct inode *inode)
+{
+ ENTRY;
+ if (inode->i_nlink) {
+ EXIT;
+ return;
+ }
+
+ obdfs_dequeue_pages(inode);
+ EXIT;
+} /* obdfs_put_inode */
+
+
static void obdfs_delete_inode(struct inode *inode)
{
struct obdo *oa;
int err;
+
ENTRY;
+ if (IOPS(inode, destroy) == NULL) {
+ printk(KERN_ERR __FUNCTION__ ": no destroy method!\n");
+ EXIT;
+ return;
+ }
oa = obdo_alloc();
if ( !oa ) {
- printk("obdfs_delete_inode: obdo_alloc failed\n");
+ printk(__FUNCTION__ ": obdo_alloc failed\n");
+ EXIT;
return;
}
oa->o_valid = OBD_MD_FLNOTOBD;
obdfs_from_inode(oa, inode);
- /* free the cache pages that might be hangning around */
- obdfs_dequeue_reqs(inode);
-
+ ODEBUG(oa);
err = IOPS(inode, destroy)(IID(inode), oa);
obdo_free(oa);
if (err) {
- printk("obdfs_delete_node: obd_destroy fails (%d)\n", err);
+ printk(__FUNCTION__ ": obd_destroy fails (%d)\n", err);
EXIT;
return;
}
int err;
ENTRY;
+ if (IOPS(inode, setattr) == NULL) {
+ printk(KERN_ERR __FUNCTION__ ": no setattr method!\n");
+ EXIT;
+ return -EIO;
+ }
oa = obdo_alloc();
if ( !oa ) {
- printk("obdfs_notify_change: obdo_alloc failed\n");
+ printk(__FUNCTION__ ": obdo_alloc failed\n");
return -ENOMEM;
}
obdo_from_iattr(oa, attr);
err = IOPS(inode, setattr)(IID(inode), oa);
- if ( err ) {
- printk("obdfs_notify_change: obd_setattr fails (%d)\n", err);
- EXIT;
- } else {
- /* Copy back attributes from oa, as there may have been
- * changes at the target (e.g. obdo becomes a redirector
- * in the snapshot layer).
- */
- obdfs_to_inode(inode, oa);
- EXIT;
- }
+ if ( err )
+ printk(__FUNCTION__ ": obd_setattr fails (%d)\n", err);
+ EXIT;
obdo_free(oa);
return err;
} /* obdfs_notify_change */
err = OPS(sb,statfs)(ID(sb), &tmp);
if ( err ) {
- printk("obdfs_notify_change: obd_statfs fails (%d)\n", err);
+ printk(__FUNCTION__ ": obd_statfs fails (%d)\n", err);
return err;
}
copy_to_user(buf, &tmp, (bufsize<sizeof(tmp)) ? bufsize : sizeof(tmp));
return err;
}
+/* exported operations */
+struct super_operations obdfs_super_operations =
+{
+ obdfs_read_inode, /* read_inode */
+ obdfs_write_inode, /* write_inode */
+ obdfs_put_inode, /* put_inode */
+ obdfs_delete_inode, /* delete_inode */
+ obdfs_notify_change, /* notify_change */
+ obdfs_put_super, /* put_super */
+ NULL, /* write_super */
+ obdfs_statfs, /* statfs */
+ NULL /* remount_fs */
+};
+
struct file_system_type obdfs_fs_type = {
"obdfs", 0, obdfs_read_super, NULL
};
obdfs_sysctl_clean();
obdfs_cleanup_pgrqcache();
unregister_filesystem(&obdfs_fs_type);
-
+ CDEBUG(D_MALLOC, "OBDFS mem used %ld\n", obd_memory);
EXIT;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff