-/*
- * linux/fs/ext2_obd/ext2_obd.c
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * linux/fs/filter/filter.c
*
* Copyright (C) 2001 Cluster File Systems, Inc.
*
*/
#define EXPORT_SYMTAB
-
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/stat.h>
-#include <linux/locks.h>
-#include <linux/ext2_fs.h>
-#include <linux/quotaops.h>
-#include <asm/unistd.h>
-
#define DEBUG_SUBSYSTEM S_FILTER
-#include <linux/obd_class.h>
-#include <linux/obd_ext2.h>
+#include <linux/module.h>
+#include <linux/lustre_dlm.h>
#include <linux/obd_filter.h>
+#include <linux/ext3_jbd.h>
+#include <linux/quotaops.h>
extern struct obd_device obd_dev[MAX_OBD_DEVICES];
long filter_memory;
#define FILTER_ROOTINO 2
#define S_SHIFT 12
-static char * obd_type_by_mode[S_IFMT >> S_SHIFT] = {
- [0] "",
- [S_IFREG >> S_SHIFT] "R",
+static char *obd_type_by_mode[S_IFMT >> S_SHIFT] = {
+ [0] NULL,
+ [S_IFREG >> S_SHIFT] "R",
[S_IFDIR >> S_SHIFT] "D",
[S_IFCHR >> S_SHIFT] "C",
- [S_IFBLK >> S_SHIFT] "B",
- [S_IFIFO >> S_SHIFT] "F",
+ [S_IFBLK >> S_SHIFT] "B",
+ [S_IFIFO >> S_SHIFT] "F",
[S_IFSOCK >> S_SHIFT] "S",
[S_IFLNK >> S_SHIFT] "L"
};
-
-
-/* push / pop to root of obd store */
-void push_ctxt(struct obd_run_ctxt *save, struct obd_run_ctxt *new)
-{
- save->fs = get_fs();
- save->pwd = dget(current->fs->pwd);
- save->pwdmnt = mntget(current->fs->pwdmnt);
-
- set_fs(new->fs);
- set_fs_pwd(current->fs, new->pwdmnt, new->pwd);
-}
-
-void pop_ctxt(struct obd_run_ctxt *saved)
+static inline const char *obd_mode_to_type(int mode)
{
- set_fs(saved->fs);
- set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd);
-
- dput(saved->pwd);
- mntput(saved->pwdmnt);
-}
-
-/* utility to make a directory */
-static int simple_mkdir(struct dentry *dir, char *name, int mode)
-{
- struct dentry *dchild;
- int err;
- ENTRY;
-
- dchild = lookup_one_len(name, dir, strlen(name));
- if (IS_ERR(dchild)) {
- EXIT;
- return PTR_ERR(dchild);
- }
-
- if (dchild->d_inode) {
- dput(dchild);
- EXIT;
- return -EEXIST;
- }
-
- err = vfs_mkdir(dir->d_inode, dchild, mode);
- dput(dchild);
-
- EXIT;
- return err;
+ return obd_type_by_mode[(mode & S_IFMT) >> S_SHIFT];
}
/* write the pathname into the string */
-static void filter_id(char *buf, obd_id id, obd_mode mode)
+static int filter_id(char *buf, obd_id id, obd_mode mode)
{
- sprintf(buf, "O/%s/%Ld", obd_type_by_mode[(mode & S_IFMT) >> S_SHIFT],
- id);
+ return sprintf(buf, "O/%s/%Ld", obd_mode_to_type(mode),
+ (unsigned long long)id);
}
/* setup the object store with correct subdirectories */
-static void filter_prep(struct obd_device *obddev)
+static int filter_prep(struct obd_device *obddev)
{
struct obd_run_ctxt saved;
+ struct filter_obd *filter = &obddev->u.filter;
+ struct dentry *dentry;
struct file *file;
struct inode *inode;
loff_t off;
- long rc;
+ int rc = 0;
char rootid[128];
__u64 lastino = 2;
-
- push_ctxt(&saved, &obddev->u.filter.fo_ctxt);
- rc = simple_mkdir(current->fs->pwd, "O", 0700);
- rc = simple_mkdir(current->fs->pwd, "P", 0700);
- rc = simple_mkdir(current->fs->pwd, "D", 0700);
- file = filp_open("O", O_RDONLY, 0);
- if (!file || IS_ERR(file)) {
- CERROR("cannot open O\n");
- goto out;
+ int mode = 0;
+
+ push_ctxt(&saved, &filter->fo_ctxt);
+ dentry = simple_mkdir(current->fs->pwd, "O", 0700);
+ CDEBUG(D_INODE, "got/created O: %p\n", dentry);
+ if (IS_ERR(dentry)) {
+ rc = PTR_ERR(dentry);
+ CERROR("cannot open/create O: rc = %d\n", rc);
+ GOTO(out, rc);
+ }
+ filter->fo_dentry_O = dentry;
+ dentry = simple_mkdir(current->fs->pwd, "P", 0700);
+ CDEBUG(D_INODE, "got/created P: %p\n", dentry);
+ if (IS_ERR(dentry)) {
+ rc = PTR_ERR(dentry);
+ CERROR("cannot open/create P: rc = %d\n", rc);
+ GOTO(out_O, rc);
+ }
+ CDEBUG(D_INODE, "putting P: %p, count = %d\n", dentry,
+ atomic_read(&dentry->d_count) - 1);
+ dput(dentry);
+ dentry = simple_mkdir(current->fs->pwd, "D", 0700);
+ CDEBUG(D_INODE, "got/created D: %p\n", dentry);
+ if (IS_ERR(dentry)) {
+ rc = PTR_ERR(dentry);
+ CERROR("cannot open/create D: rc = %d\n", rc);
+ GOTO(out_O, rc);
+ }
+ CDEBUG(D_INODE, "putting D: %p, count = %d\n", dentry,
+ atomic_read(&dentry->d_count) - 1);
+ dput(dentry);
+
+ /*
+ * Create directories and/or get dentries for each object type.
+ * This saves us from having to do multiple lookups for each one.
+ */
+ for (mode = 0; mode < (S_IFMT >> S_SHIFT); mode++) {
+ char *type = obd_type_by_mode[mode];
+
+ if (!type) {
+ filter->fo_dentry_O_mode[mode] = NULL;
+ continue;
+ }
+ dentry = simple_mkdir(filter->fo_dentry_O, type, 0700);
+ CDEBUG(D_INODE, "got/created O/%s: %p\n", type, dentry);
+ if (IS_ERR(dentry)) {
+ rc = PTR_ERR(dentry);
+ CERROR("cannot create O/%s: rc = %d\n", type, rc);
+ GOTO(out_O_mode, rc);
+ }
+ filter->fo_dentry_O_mode[mode] = dentry;
}
- rc = simple_mkdir(file->f_dentry, "R", 0700); /* regular */
- rc = simple_mkdir(file->f_dentry, "D", 0700); /* directory */
- rc = simple_mkdir(file->f_dentry, "L", 0700); /* symbolic links */
- rc = simple_mkdir(file->f_dentry, "C", 0700); /* character devices */
- rc = simple_mkdir(file->f_dentry, "B", 0700); /* block devices */
- rc = simple_mkdir(file->f_dentry, "F", 0700); /* fifo's */
- rc = simple_mkdir(file->f_dentry, "S", 0700); /* sockets */
- filp_close(file, NULL);
filter_id(rootid, FILTER_ROOTINO, S_IFDIR);
- file = filp_open(rootid, O_RDWR | O_CREAT, 00755);
+ file = filp_open(rootid, O_RDWR | O_CREAT, 0755);
if (IS_ERR(file)) {
- CERROR("OBD filter: cannot make root directory");
- goto out;
+ rc = PTR_ERR(file);
+ CERROR("OBD filter: cannot open/create root %s: rc = %d\n",
+ rootid, rc);
+ GOTO(out_O_mode, rc);
}
filp_close(file, 0);
- rc = simple_mkdir(current->fs->pwd, rootid, 0755);
file = filp_open("D/status", O_RDWR | O_CREAT, 0700);
if ( !file || IS_ERR(file) ) {
- CERROR("OBD filter: cannot open/create status file\n");
- goto out;
+ rc = PTR_ERR(file);
+ CERROR("OBD filter: cannot open/create status %s: rc = %d\n",
+ "D/status", rc);
+ GOTO(out_O_mode, rc);
}
/* steal operations */
inode = file->f_dentry->d_inode;
- obddev->u.filter.fo_fop = file->f_op;
- obddev->u.filter.fo_iop = inode->i_op;
- obddev->u.filter.fo_aops = inode->i_mapping->a_ops;
+ filter->fo_fop = file->f_op;
+ filter->fo_iop = inode->i_op;
+ filter->fo_aops = inode->i_mapping->a_ops;
off = 0;
- if (inode->i_size == 0) {
- rc = file->f_op->write(file, (char *)&lastino,
- sizeof(lastino), &off);
- if (rc != sizeof(lastino)) {
- CERROR("OBD filter: error writing lastino\n");
- goto out;
+ if (inode->i_size == 0) {
+ ssize_t retval = file->f_op->write(file, (char *)&lastino,
+ sizeof(lastino), &off);
+ if (retval != sizeof(lastino)) {
+ CDEBUG(D_INODE, "OBD filter: error writing lastino\n");
+ filp_close(file, 0);
+ GOTO(out_O_mode, rc = -EIO);
}
- } else {
- rc = file->f_op->read(file, (char *)&lastino, sizeof(lastino),
- &off);
- if (rc != sizeof(lastino)) {
- CERROR("OBD filter: error reading lastino\n");
- goto out;
+ } else {
+ ssize_t retval = file->f_op->read(file, (char *)&lastino,
+ sizeof(lastino), &off);
+ if (retval != sizeof(lastino)) {
+ CDEBUG(D_INODE, "OBD filter: error reading lastino\n");
+ filp_close(file, 0);
+ GOTO(out_O_mode, rc = -EIO);
}
}
- obddev->u.filter.fo_lastino = lastino;
- filp_close(file, 0);
+ filter->fo_lastino = lastino;
+ filp_close(file, 0);
+ rc = 0;
out:
pop_ctxt(&saved);
+
+ return(rc);
+
+out_O_mode:
+ while (mode-- > 0) {
+ struct dentry *dentry = filter->fo_dentry_O_mode[mode];
+ if (dentry) {
+ CDEBUG(D_INODE, "putting O/%s: %p, count = %d\n",
+ obd_type_by_mode[mode], dentry,
+ atomic_read(&dentry->d_count) - 1);
+ dput(dentry);
+ filter->fo_dentry_O_mode[mode] = NULL;
+ }
+ }
+out_O:
+ CDEBUG(D_INODE, "putting O: %p, count = %d\n", filter->fo_dentry_O,
+ atomic_read(&filter->fo_dentry_O->d_count) - 1);
+ dput(filter->fo_dentry_O);
+ filter->fo_dentry_O = NULL;
+ goto out;
}
/* cleanup the filter: write last used object id to status file */
static void filter_post(struct obd_device *obddev)
{
struct obd_run_ctxt saved;
+ struct filter_obd *filter = &obddev->u.filter;
long rc;
struct file *file;
- loff_t off = 0;
+ loff_t off = 0;
+ int mode;
- push_ctxt(&saved, &obddev->u.filter.fo_ctxt);
+ push_ctxt(&saved, &filter->fo_ctxt);
file = filp_open("D/status", O_RDWR | O_CREAT, 0700);
- if ( !file || IS_ERR(file)) {
+ if (IS_ERR(file)) {
CERROR("OBD filter: cannot create status file\n");
goto out;
}
- rc = file->f_op->write(file, (char *)&obddev->u.filter.fo_lastino,
- sizeof(obddev->u.filter.fo_lastino), &off);
- if (rc != sizeof(obddev->u.filter.fo_lastino) ) {
- CERROR("OBD filter: error writing lastino\n");
- }
+ rc = file->f_op->write(file, (char *)&filter->fo_lastino,
+ sizeof(filter->fo_lastino), &off);
+ if (rc != sizeof(filter->fo_lastino))
+ CERROR("OBD filter: error writing lastino: rc = %ld\n", rc);
- rc = filp_close(file, NULL);
- if (rc) {
- CERROR("OBD filter: cannot close status file\n");
+ rc = filp_close(file, NULL);
+ if (rc)
+ CERROR("OBD filter: cannot close status file: rc = %ld\n", rc);
+
+ for (mode = 0; mode < (S_IFMT >> S_SHIFT); mode++) {
+ struct dentry *dentry = filter->fo_dentry_O_mode[mode];
+ if (dentry) {
+ CDEBUG(D_INODE, "putting O/%s: %p, count = %d\n",
+ obd_type_by_mode[mode], dentry,
+ atomic_read(&dentry->d_count) - 1);
+ dput(dentry);
+ filter->fo_dentry_O_mode[mode] = NULL;
+ }
}
- out:
+ CDEBUG(D_INODE, "putting O: %p, count = %d\n", filter->fo_dentry_O,
+ atomic_read(&filter->fo_dentry_O->d_count) - 1);
+ dput(filter->fo_dentry_O);
+out:
pop_ctxt(&saved);
}
-static __u64 filter_next_id(struct obd_device *obddev)
+static __u64 filter_next_id(struct obd_device *obddev)
{
__u64 id;
spin_lock(&obddev->u.filter.fo_lock);
}
/* how to get files, dentries, inodes from object id's */
-static struct file *filter_obj_open(struct obd_device *obddev,
- __u64 id, __u32 type)
+/* parent i_sem is already held if needed for exclusivity */
+static struct dentry *filter_fid2dentry(struct obd_device *obddev,
+ struct dentry *dparent,
+ __u64 id, __u32 type)
{
+ struct super_block *sb = obddev->u.filter.fo_sb;
+ struct dentry *dchild;
+ char name[32];
+ int len;
+ ENTRY;
+
+ if (!sb || !sb->s_dev) {
+ CERROR("fatal: device not initialized.\n");
+ RETURN(ERR_PTR(-ENXIO));
+ }
+
+ if (id == 0) {
+ CERROR("fatal: invalid object #0\n");
+ LBUG();
+ RETURN(ERR_PTR(-ESTALE));
+ }
+
+ if (!(type & S_IFMT)) {
+ CERROR("OBD %s, object %Lu has bad type: %o\n", __FUNCTION__,
+ (unsigned long long)id, type);
+ RETURN(ERR_PTR(-EINVAL));
+ }
+
+ len = sprintf(name, "%Ld", id);
+ CDEBUG(D_INODE, "opening object O/%s/%s\n", obd_mode_to_type(type),
+ name);
+ dchild = lookup_one_len(name, dparent, len);
+ CDEBUG(D_INODE, "got child obj O/%s/%s: %p, count = %d\n",
+ obd_mode_to_type(type), name, dchild,
+ atomic_read(&dchild->d_count));
+
+ if (IS_ERR(dchild)) {
+ CERROR("child lookup error %ld\n", PTR_ERR(dchild));
+ RETURN(dchild);
+ }
+
+ RETURN(dchild);
+}
+
+static struct file *filter_obj_open(struct obd_device *obddev,
+ __u64 id, __u32 type)
+{
+ struct super_block *sb = obddev->u.filter.fo_sb;
struct obd_run_ctxt saved;
char name[24];
- struct super_block *sb;
struct file *file;
-
- sb = obddev->u.filter.fo_sb;
+ ENTRY;
+
if (!sb || !sb->s_dev) {
- CDEBUG(D_SUPER, "fatal: device not initialized.\n");
- EXIT;
- return NULL;
+ CERROR("fatal: device not initialized.\n");
+ RETURN(ERR_PTR(-ENXIO));
}
- if ( !id ) {
- CDEBUG(D_INODE, "fatal: invalid obdo %Lu\n", id);
- EXIT;
- return NULL;
+ if (!id) {
+ CERROR("fatal: invalid obdo %Lu\n", (unsigned long long)id);
+ RETURN(ERR_PTR(-ESTALE));
}
- if ( ! (type & S_IFMT) ) {
- CERROR("OBD filter_obj_open, no type (%Ld), mode %o!\n",
- id, type);
+ if (!(type & S_IFMT)) {
+ CERROR("OBD %s, no type (%Ld), mode %o!\n", __FUNCTION__,
+ (unsigned long long)id, type);
+ RETURN(ERR_PTR(-EINVAL));
}
- filter_id(name, id, type);
+ filter_id(name, id, type);
push_ctxt(&saved, &obddev->u.filter.fo_ctxt);
- file = filp_open(name, O_RDONLY | O_LARGEFILE, 0);
+ file = filp_open(name, O_RDONLY | O_LARGEFILE, 0 /* type? */);
pop_ctxt(&saved);
- CDEBUG(D_INODE, "opening obdo %s\n", name);
+ CDEBUG(D_INODE, "opening obdo %s: rc = %p\n", name, file);
- return file;
+ if (IS_ERR(file))
+ file = NULL;
+ RETURN(file);
}
-static struct file *filter_parent(obd_id id, obd_mode mode)
+static struct dentry *filter_parent(struct obd_device *obddev, obd_mode mode)
{
- char path[64];
- struct file *file;
+ struct filter_obd *filter = &obddev->u.filter;
- sprintf(path, "O/%s", obd_type_by_mode[(mode & S_IFMT) >> S_SHIFT]);
-
- file = filp_open(path, O_RDONLY, 0);
- return file;
+ return filter->fo_dentry_O_mode[(mode & S_IFMT) >> S_SHIFT];
}
-static struct inode *filter_inode_from_obj(struct obd_device *obddev,
- __u64 id, __u32 type)
+static struct inode *filter_inode_from_obj(struct obd_device *obddev,
+ __u64 id, __u32 type)
{
- struct file *file;
- struct inode *inode;
+ struct dentry *dentry;
+ struct inode *inode;
- file = filter_obj_open(obddev, id, type);
- if ( !file ) {
- CERROR("filter_inode_from_obdo failed\n");
- return NULL;
+ dentry = filter_fid2dentry(obddev, filter_parent(obddev, type),
+ id, type);
+ if (IS_ERR(dentry)) {
+ CERROR("%s: lookup failed: rc = %ld\n", __FUNCTION__,
+ PTR_ERR(dentry));
+ RETURN(NULL);
}
- inode = iget(file->f_dentry->d_inode->i_sb,
- file->f_dentry->d_inode->i_ino);
- filp_close(file, 0);
+ lock_kernel();
+ inode = iget(dentry->d_inode->i_sb, dentry->d_inode->i_ino);
+ unlock_kernel();
+ CDEBUG(D_INODE, "put child %p, count = %d\n", dentry,
+ atomic_read(&dentry->d_count) - 1);
+ dput(dentry);
+ CDEBUG(D_INODE, "got inode %p (%ld), count = %d\n", inode, inode->i_ino,
+ atomic_read(&inode->i_count));
return inode;
}
/* obd methods */
-static int filter_connect(struct obd_conn *conn)
+static int filter_connect(struct lustre_handle *conn, struct obd_device *obd)
{
int rc;
MOD_INC_USE_COUNT;
- rc = gen_connect(conn);
+ rc = class_connect(conn, obd);
if (rc)
MOD_DEC_USE_COUNT;
return rc;
}
-static int filter_disconnect(struct obd_conn *conn)
+static int filter_disconnect(struct lustre_handle *conn)
{
int rc;
- rc = gen_disconnect(conn);
+ rc = class_disconnect(conn);
if (!rc)
MOD_DEC_USE_COUNT;
}
/* mount the file system (secretly) */
-static int filter_setup(struct obd_device *obddev, obd_count len,
- void *buf)
-
+static int filter_setup(struct obd_device *obddev, obd_count len, void *buf)
{
struct obd_ioctl_data* data = buf;
+ struct filter_obd *filter;
struct vfsmount *mnt;
- int err;
+ int err = 0;
ENTRY;
-
-
- mnt = do_kern_mount(data->ioc_inlbuf2, 0,
- data->ioc_inlbuf1, NULL);
- err = PTR_ERR(mnt);
- if (IS_ERR(mnt)) {
- EXIT;
- return err;
- }
-
- obddev->u.filter.fo_sb = mnt->mnt_root->d_inode->i_sb;
- if (!obddev->u.filter.fo_sb) {
- EXIT;
- return -ENODEV;
- }
-
- obddev->u.filter.fo_vfsmnt = mnt;
- obddev->u.filter.fo_fstype = strdup(data->ioc_inlbuf2);
-
- obddev->u.filter.fo_ctxt.pwdmnt = mnt;
- obddev->u.filter.fo_ctxt.pwd = mnt->mnt_root;
- obddev->u.filter.fo_ctxt.fs = KERNEL_DS;
- filter_prep(obddev);
- spin_lock_init(&obddev->u.filter.fo_lock);
+ if (!data->ioc_inlbuf1 || !data->ioc_inlbuf2)
+ RETURN(-EINVAL);
MOD_INC_USE_COUNT;
- EXIT;
- return 0;
-}
+ mnt = do_kern_mount(data->ioc_inlbuf2, 0, data->ioc_inlbuf1, NULL);
+ err = PTR_ERR(mnt);
+ if (IS_ERR(mnt))
+ GOTO(err_dec, err);
+
+ filter = &obddev->u.filter;;
+ filter->fo_sb = mnt->mnt_root->d_inode->i_sb;
+ /* XXX is this even possible if do_kern_mount succeeded? */
+ if (!filter->fo_sb)
+ GOTO(err_put, err = -ENODEV);
+
+ filter->fo_vfsmnt = mnt;
+ filter->fo_fstype = strdup(data->ioc_inlbuf2);
+
+ OBD_SET_CTXT_MAGIC(&filter->fo_ctxt);
+ filter->fo_ctxt.pwdmnt = mnt;
+ filter->fo_ctxt.pwd = mnt->mnt_root;
+ filter->fo_ctxt.fs = get_ds();
+
+ err = filter_prep(obddev);
+ if (err)
+ GOTO(err_kfree, err);
+ spin_lock_init(&filter->fo_lock);
+
+ obddev->obd_namespace =
+ ldlm_namespace_new("filter-tgt", LDLM_NAMESPACE_SERVER);
+ if (obddev->obd_namespace == NULL)
+ LBUG();
+
+ RETURN(0);
+
+err_kfree:
+ kfree(filter->fo_fstype);
+err_put:
+ unlock_kernel();
+ mntput(filter->fo_vfsmnt);
+ filter->fo_sb = 0;
+ lock_kernel();
+
+err_dec:
+ MOD_DEC_USE_COUNT;
+ return err;
+}
static int filter_cleanup(struct obd_device * obddev)
{
struct super_block *sb;
-
ENTRY;
- if ( !(obddev->obd_flags & OBD_SET_UP) ) {
- EXIT;
- return 0;
- }
+ if (!(obddev->obd_flags & OBD_SET_UP))
+ RETURN(0);
- if ( !list_empty(&obddev->obd_gen_clients) ) {
+ if (!list_empty(&obddev->obd_exports)) {
CERROR("still has clients!\n");
- EXIT;
- return -EBUSY;
+ RETURN(-EBUSY);
}
+ ldlm_namespace_free(obddev->obd_namespace);
+
sb = obddev->u.filter.fo_sb;
- if (!obddev->u.filter.fo_sb){
- EXIT;
- return 0;
- }
+ if (!obddev->u.filter.fo_sb)
+ RETURN(0);
+
filter_post(obddev);
+ shrink_dcache_parent(sb->s_root);
unlock_kernel();
- mntput(obddev->u.filter.fo_vfsmnt);
+ mntput(obddev->u.filter.fo_vfsmnt);
obddev->u.filter.fo_sb = 0;
kfree(obddev->u.filter.fo_fstype);
lock_kernel();
MOD_DEC_USE_COUNT;
- EXIT;
- return 0;
+ RETURN(0);
}
}
#if 0
- else if (ext2obd_has_inline(inode)) {
+ else if (filter_has_inline(inode)) {
CDEBUG(D_INFO, "copying inline from inode to obdo\n");
memcpy(oa->o_inline, inode->u.ext2_i.i_data,
MIN(sizeof(inode->u.ext2_i.i_data),OBD_INLINESZ));
oa->o_valid |= OBD_MD_FLINLINE;
}
- if (ext2obd_has_obdmd(inode)) {
- /* XXX this will change when we don't store the obdmd in data */
- CDEBUG(D_INFO, "copying obdmd from inode to obdo\n");
- memcpy(oa->o_obdmd, inode->u.ext2_i.i_data,
- MIN(sizeof(inode->u.ext2_i.i_data),OBD_INLINESZ));
- oa->o_obdflags |= OBD_FL_OBDMDEXISTS;
- oa->o_valid |= OBD_MD_FLOBDMD;
- }
#endif
EXIT;
}
-static int filter_getattr(struct obd_conn *conn, struct obdo *oa)
+static int filter_getattr(struct lustre_handle *conn, struct obdo *oa)
{
- struct inode *inode;
-
+ struct obd_device *obddev = class_conn2obd(conn);
+ struct dentry *dentry;
ENTRY;
- if ( !gen_client(conn) ) {
- CDEBUG(D_IOCTL, "fatal: invalid client %u\n", conn->oc_id);
- EXIT;
- return -EINVAL;
- }
- if ( !(inode = filter_inode_from_obj(conn->oc_dev,
- oa->o_id, oa->o_mode)) ) {
- EXIT;
- return -ENOENT;
+ if (!class_conn2export(conn)) {
+ CDEBUG(D_IOCTL, "fatal: invalid client %Lx\n", conn->addr);
+ RETURN(-EINVAL);
}
+ obddev = class_conn2obd(conn);
+ dentry = filter_fid2dentry(obddev, filter_parent(obddev, oa->o_mode),
+ oa->o_id, oa->o_mode);
+ if (IS_ERR(dentry))
+ RETURN(PTR_ERR(dentry));
+
oa->o_valid &= ~OBD_MD_FLID;
- filter_from_inode(oa, inode);
-
- iput(inode);
- EXIT;
- return 0;
-}
+ filter_from_inode(oa, dentry->d_inode);
+
+ dput(dentry);
+ RETURN(0);
+}
-static int filter_setattr(struct obd_conn *conn, struct obdo *oa)
+static int filter_setattr(struct lustre_handle *conn, struct obdo *oa)
{
- struct inode *inode;
+ struct obd_run_ctxt saved;
+ struct obd_device *obd = class_conn2obd(conn);
+ struct dentry *dentry;
struct iattr iattr;
+ struct inode *inode;
int rc;
- struct dentry de;
-
- if (!gen_client(conn)) {
- CDEBUG(D_IOCTL, "invalid client %u\n", conn->oc_id);
- return -EINVAL;
- }
+ ENTRY;
- inode = filter_inode_from_obj(conn->oc_dev, oa->o_id, oa->o_mode);
- if ( !inode ) {
- EXIT;
- return -ENOENT;
- }
+ dentry = filter_fid2dentry(obd, filter_parent(obd, oa->o_mode),
+ oa->o_id, oa->o_mode);
+ if (IS_ERR(dentry))
+ RETURN(PTR_ERR(dentry));
+ inode = dentry->d_inode;
iattr_from_obdo(&iattr, oa);
iattr.ia_mode &= ~S_IFMT;
iattr.ia_mode |= S_IFREG;
- de.d_inode = inode;
- if ( inode->i_op->setattr ) {
- rc = inode->i_op->setattr(&de, &iattr);
- } else {
+ lock_kernel();
+ if (iattr.ia_mode & ATTR_SIZE)
+ down(&inode->i_sem);
+ push_ctxt(&saved, &obd->u.filter.fo_ctxt);
+ if (inode->i_op->setattr)
+ rc = inode->i_op->setattr(dentry, &iattr);
+ else
rc = inode_setattr(inode, &iattr);
+ pop_ctxt(&saved);
+ if (iattr.ia_mode & ATTR_SIZE) {
+ up(&inode->i_sem);
+ oa->o_valid = OBD_MD_FLBLOCKS | OBD_MD_FLCTIME | OBD_MD_FLMTIME;
+ obdo_from_inode(oa, inode);
}
+ unlock_kernel();
- iput(inode);
- EXIT;
- return rc;
+ CDEBUG(D_INODE, "put dentry %p, count = %d\n", inode,
+ atomic_read(&dentry->d_count) - 1);
+ dput(dentry);
+ RETURN(rc);
}
-static int filter_create (struct obd_conn* conn, struct obdo *oa)
+static int filter_open(struct lustre_handle *conn, struct obdo *oa)
+{
+ struct obd_device *obd;
+ struct dentry *dentry;
+ /* ENTRY; */
+
+ if (!class_conn2export(conn)) {
+ CDEBUG(D_IOCTL, "fatal: invalid client %Lx\n", conn->addr);
+ RETURN(-EINVAL);
+ }
+
+ obd = class_conn2obd(conn);
+ dentry = filter_fid2dentry(obd, filter_parent(obd, oa->o_mode),
+ oa->o_id, oa->o_mode);
+ if (IS_ERR(dentry))
+ RETURN(PTR_ERR(dentry));
+
+ return 0;
+} /* filter_open */
+
+static int filter_close(struct lustre_handle *conn, struct obdo *oa)
+{
+ struct obd_device *obd;
+ struct dentry *dentry;
+ /* ENTRY; */
+
+ if (!class_conn2export(conn)) {
+ CDEBUG(D_IOCTL, "fatal: invalid client %Lx\n", conn->addr);
+ RETURN(-EINVAL);
+ }
+
+ obd = class_conn2obd(conn);
+ dentry = filter_fid2dentry(obd, filter_parent(obd, oa->o_mode),
+ oa->o_id, oa->o_mode);
+ if (IS_ERR(dentry))
+ RETURN(PTR_ERR(dentry));
+
+ CDEBUG(D_INODE, "put dentry %p, count = %d\n", dentry,
+ atomic_read(&dentry->d_count) - 1);
+ dput(dentry); /* for the close */
+ CDEBUG(D_INODE, "put dentry %p, count = %d\n", dentry,
+ atomic_read(&dentry->d_count) - 1);
+ dput(dentry); /* for this call */
+ return 0;
+} /* filter_close */
+
+static int filter_create(struct lustre_handle* conn, struct obdo *oa)
{
char name[64];
struct obd_run_ctxt saved;
struct file *file;
int mode;
- struct obd_device *obddev = conn->oc_dev;
+ struct obd_device *obd = class_conn2obd(conn);
struct iattr;
ENTRY;
- if (!gen_client(conn)) {
- CERROR("invalid client %u\n", conn->oc_id);
+ if (!class_conn2export(conn)) {
+ CERROR("invalid client %Lx\n", conn->addr);
return -EINVAL;
}
- oa->o_id = filter_next_id(conn->oc_dev);
- if ( !(oa->o_mode && S_IFMT) ) {
+ oa->o_id = filter_next_id(obd);
+ if (!(oa->o_mode && S_IFMT)) {
CERROR("filter obd: no type!\n");
return -ENOENT;
}
filter_id(name, oa->o_id, oa->o_mode);
- push_ctxt(&saved, &obddev->u.filter.fo_ctxt);
- mode = oa->o_mode;
- mode &= ~S_IFMT;
- mode |= S_IFREG;
+ mode = (oa->o_mode & ~S_IFMT) | S_IFREG;
+ push_ctxt(&saved, &obd->u.filter.fo_ctxt);
file = filp_open(name, O_RDONLY | O_CREAT, mode);
pop_ctxt(&saved);
- if (IS_ERR(file)) {
+ if (IS_ERR(file)) {
CERROR("Error mknod obj %s, err %ld\n", name, PTR_ERR(file));
return -ENOENT;
}
filp_close(file, 0);
-
- /* Set flags for fields we have set in ext2_new_inode */
+
+ /* Set flags for fields we have set in the inode struct */
oa->o_valid |= OBD_MD_FLID | OBD_MD_FLBLKSZ | OBD_MD_FLBLOCKS |
OBD_MD_FLMTIME | OBD_MD_FLATIME | OBD_MD_FLCTIME |
OBD_MD_FLUID | OBD_MD_FLGID;
+
+ /* XXX Hmm, shouldn't we copy the fields into the obdo here? */
return 0;
}
-static int filter_destroy(struct obd_conn *conn, struct obdo *oa)
+static int filter_destroy(struct lustre_handle *conn, struct obdo *oa)
{
- struct obd_device * obddev;
- struct obd_client * cli;
- struct inode * inode;
- struct file *dir;
- struct file *object;
- int rc;
struct obd_run_ctxt saved;
+ struct obd_device *obd;
+ struct obd_export *export;
+ struct inode *inode;
+ struct dentry *dir_dentry, *object_dentry;
+ int rc;
+ ENTRY;
- if (!(cli = gen_client(conn))) {
- CERROR("invalid client %u\n", conn->oc_id);
- EXIT;
- return -EINVAL;
+ if (!(export = class_conn2export(conn))) {
+ CERROR("invalid client %Lx\n", conn->addr);
+ RETURN(-EINVAL);
}
- obddev = conn->oc_dev;
- object = filter_obj_open(obddev, oa->o_id, oa->o_mode);
- if (!object || IS_ERR(object)) {
- EXIT;
- return -ENOENT;
- }
-
- inode = object->f_dentry->d_inode;
- inode->i_nlink = 1;
- inode->i_mode = 010000;
+ CDEBUG(D_INODE, "destroying object %Ld\n",oa->o_id);
+ obd = class_conn2obd(conn);
- push_ctxt(&saved, &obddev->u.filter.fo_ctxt);
- dir = filter_parent(oa->o_id, oa->o_mode);
- if (IS_ERR(dir)) {
- rc = PTR_ERR(dir);
- EXIT;
- goto out;
+ dir_dentry = filter_parent(obd, oa->o_mode);
+ down(&dir_dentry->d_inode->i_sem);
+
+ object_dentry = filter_fid2dentry(obd, dir_dentry, oa->o_id,
+ oa->o_mode);
+ if (IS_ERR(object_dentry))
+ GOTO(out, rc = -ENOENT);
+
+ inode = object_dentry->d_inode;
+ if (inode->i_nlink != 1) {
+ CERROR("destroying inode with nlink = %d\n", inode->i_nlink);
+ inode->i_nlink = 1;
}
- dget(dir->f_dentry);
- dget(object->f_dentry);
- rc = vfs_unlink(dir->f_dentry->d_inode, object->f_dentry);
+ inode->i_mode = S_IFREG;
- filp_close(dir, 0);
- filp_close(object, 0);
-out:
+ push_ctxt(&saved, &obd->u.filter.fo_ctxt);
+
+ rc = vfs_unlink(dir_dentry->d_inode, object_dentry);
pop_ctxt(&saved);
+ CDEBUG(D_INODE, "put child %p, count = %d\n", object_dentry,
+ atomic_read(&object_dentry->d_count) - 1);
+ dput(object_dentry);
+
EXIT;
+out:
+ up(&dir_dentry->d_inode->i_sem);
return rc;
}
-static int filter_truncate(struct obd_conn *conn, struct obdo *oa, obd_size count,
- obd_off offset)
+/* NB count and offset are used for punch, but not truncate */
+static int filter_truncate(struct lustre_handle *conn, struct obdo *oa,
+ obd_size count, obd_off offset)
{
int error;
+ ENTRY;
+ CDEBUG(D_INODE, "calling truncate for object #%Ld, valid = %x, "
+ "o_size = %Ld\n", oa->o_id, oa->o_valid, oa->o_size);
error = filter_setattr(conn, oa);
- oa->o_valid = OBD_MD_FLBLOCKS | OBD_MD_FLCTIME | OBD_MD_FLMTIME;
-
- EXIT;
- return error;
-}
-
-/* buffer must lie in user memory here */
-static int filter_read(struct obd_conn *conn, struct obdo *oa, char *buf,
- obd_size *count, obd_off offset)
-{
- struct file * file;
- unsigned long retval;
- int err;
-
- if (!gen_client(conn)) {
- CDEBUG(D_IOCTL, "invalid client %u\n", conn->oc_id);
- EXIT;
- return -EINVAL;
- }
-
- file = filter_obj_open(conn->oc_dev, oa->o_id, oa->o_mode);
- if (!file || IS_ERR(file)) {
- EXIT;
- return -PTR_ERR(file);
- }
-
- /* count doubles as retval */
- retval = file->f_op->read(file, buf, *count, &offset);
- filp_close(file, 0);
- if ( retval >= 0 ) {
- err = 0;
- *count = retval;
- } else {
- err = retval;
- *count = 0;
- }
-
- return err;
+ RETURN(error);
}
-
-/* buffer must lie in user memory here */
-static int filter_write(struct obd_conn *conn, struct obdo *oa, char *buf,
- obd_size *count, obd_off offset)
-{
- int err;
- struct file * file;
- unsigned long retval;
-
- ENTRY;
- if (!gen_client(conn)) {
- CDEBUG(D_IOCTL, "invalid client %u\n", conn->oc_id);
- EXIT;
- return -EINVAL;
- }
-
- file = filter_obj_open(conn->oc_dev, oa->o_id, oa->o_mode);
- if (!file || IS_ERR(file)) {
- EXIT;
- return -PTR_ERR(file);
- }
-
- /* count doubles as retval */
- retval = file->f_op->write(file, buf, *count, &offset);
- filp_close(file, 0);
-
- if ( retval >= 0 ) {
- err = 0;
- *count = retval;
- EXIT;
- } else {
- err = retval;
- *count = 0;
- EXIT;
- }
-
- return err;
-} /* ext2obd_write */
-
-static int filter_pgcache_brw(int rw, struct obd_conn *conn,
- obd_count num_oa,
- struct obdo **oa,
- obd_count *oa_bufs,
- struct page **pages,
- obd_size *count,
- obd_off *offset,
- obd_flag *flags)
+static int filter_pgcache_brw(int cmd, struct lustre_handle *conn, obd_count num_oa,
+ struct obdo **oa, obd_count *oa_bufs,
+ struct page **pages, obd_size *count,
+ obd_off *offset, obd_flag *flags, void *callback)
{
+ struct obd_run_ctxt saved;
struct super_block *sb;
- mm_segment_t oldfs;
int onum; /* index to oas */
int pnum; /* index to pages (bufs) */
unsigned long retval;
int error;
- struct file *file;
-
+ struct file *file;
+ struct obd_device *obd = class_conn2obd(conn);
ENTRY;
- if (!gen_client(conn)) {
- CDEBUG(D_IOCTL, "invalid client %u\n", conn->oc_id);
- EXIT;
- return -EINVAL;
+ if (!class_conn2export(conn)) {
+ CDEBUG(D_IOCTL, "invalid client %Lx\n", conn->addr);
+ RETURN(-EINVAL);
}
- sb = conn->oc_dev->u.filter.fo_sb;
- oldfs = get_fs();
- set_fs(KERNEL_DS);
-
+ sb = obd->u.filter.fo_sb;
+ push_ctxt(&saved, &obd->u.filter.fo_ctxt);
pnum = 0; /* pnum indexes buf 0..num_pages */
for (onum = 0; onum < num_oa; onum++) {
- int pg;
+ int pg;
- file = filter_obj_open(conn->oc_dev, oa[onum]->o_id,
- oa[onum]->o_mode);
- if (!file || IS_ERR(file)) {
- EXIT;
- error = -ENOENT;
- goto ERROR;
- }
+ file = filter_obj_open(obd, oa[onum]->o_id, oa[onum]->o_mode);
+ if (IS_ERR(file))
+ GOTO(out, retval = PTR_ERR(file));
/* count doubles as retval */
for (pg = 0; pg < oa_bufs[onum]; pg++) {
- CDEBUG(D_INODE, "OP %d obdo no/pno: (%d,%d) (%ld,%ld) off count (%Ld,%Ld)\n",
- rw, onum, pnum, file->f_dentry->d_inode->i_ino,
+ CDEBUG(D_INODE, "OP %d obdo no/pno: (%d,%d) (%ld,%ld) "
+ "off count (%Ld,%Ld)\n",
+ cmd, onum, pnum, file->f_dentry->d_inode->i_ino,
(unsigned long)offset[pnum] >> PAGE_CACHE_SHIFT,
- offset[pnum], count[pnum]);
- if (rw == WRITE) {
- loff_t off;
+ (unsigned long long)offset[pnum],
+ (unsigned long long)count[pnum]);
+ if (cmd & OBD_BRW_WRITE) {
+ loff_t off;
char *buffer;
- off = offset[pnum];
- buffer = kmap(pages[pnum]);
+ off = offset[pnum];
+ buffer = kmap(pages[pnum]);
retval = file->f_op->write(file, buffer, count[pnum], &off);
kunmap(pages[pnum]);
- CDEBUG(D_INODE, "retval %ld\n", retval);
- } else {
- loff_t off = offset[pnum];
+ CDEBUG(D_INODE, "retval %ld\n", retval);
+ } else {
+ loff_t off = offset[pnum];
char *buffer = kmap(pages[pnum]);
if (off >= file->f_dentry->d_inode->i_size) {
retval = count[pnum];
} else {
retval = file->f_op->read(file, buffer, count[pnum], &off);
- }
+ }
kunmap(pages[pnum]);
- if ( retval != count[pnum] ) {
+ if (retval != count[pnum]) {
filp_close(file, 0);
- retval = -EIO;
- EXIT;
- goto ERROR;
+ GOTO(out, retval = -EIO);
}
- CDEBUG(D_INODE, "retval %ld\n", retval);
+ CDEBUG(D_INODE, "retval %ld\n", retval);
}
pnum++;
}
/* sizes and blocks are set by generic_file_write */
- /* ctimes/mtimes will follow with a setattr call */
+ /* ctimes/mtimes will follow with a setattr call */
filp_close(file, 0);
}
-
+
EXIT;
- ERROR:
- set_fs(oldfs);
+out:
+ pop_ctxt(&saved);
error = (retval >= 0) ? 0 : retval;
return error;
}
-struct inode *ioobj_to_inode(struct obd_conn *conn, struct obd_ioobj *o)
+struct inode *ioobj_to_inode(struct lustre_handle *conn, struct obd_ioobj *o)
{
+ struct obd_device *obd = class_conn2obd(conn);
+ struct super_block *sb = obd->u.filter.fo_sb;
struct inode *inode = NULL;
- struct super_block *sb = conn->oc_dev->u.ext2.e2_sb;
+ ENTRY;
if (!sb || !sb->s_dev) {
CDEBUG(D_SUPER, "fatal: device not initialized.\n");
- EXIT;
- return NULL;
+ RETURN(NULL);
}
if ( !o->ioo_id ) {
CDEBUG(D_INODE, "fatal: invalid obdo %lu\n", (long)o->ioo_id);
- EXIT;
- return NULL;
+ RETURN(NULL);
}
- inode = filter_inode_from_obj(conn->oc_dev, o->ioo_id, S_IFREG);
+ inode = filter_inode_from_obj(obd, o->ioo_id, S_IFREG);
if (!inode || inode->i_nlink == 0 || is_bad_inode(inode)) {
CERROR("from obdo - fatal: invalid inode %ld (%s).\n",
(long)o->ioo_id, inode ? inode->i_nlink ? "bad inode" :
"no links" : "NULL");
- if (inode)
- iput(inode);
- EXIT;
- return NULL;
+ iput(inode);
+ RETURN(NULL);
}
- return inode;
+ RETURN(inode);
+}
+
+/*
+ * Calculate the number of buffer credits needed to write multiple pages in
+ * a single ext3/extN transaction. No, this shouldn't be here, but as yet
+ * ext3 doesn't have a nice API for calculating this sort of thing in advance.
+ *
+ * See comment above ext3_writepage_trans_blocks for details. We assume
+ * no data journaling is being done, but it does allow for all of the pages
+ * being non-contiguous. If we are guaranteed contiguous pages we could
+ * reduce the number of (d)indirect blocks a lot.
+ *
+ * With N blocks per page and P pages, for each inode we have at most:
+ * N*P indirect
+ * min(N*P, blocksize/4 + 1) dindirect blocks
+ * 1 tindirect
+ *
+ * For the entire filesystem, we have at most:
+ * min(sum(nindir + P), ngroups) bitmap blocks (from the above)
+ * min(sum(nindir + P), gdblocks) group descriptor blocks (from the above)
+ * 1 inode block
+ * 1 superblock
+ * 2 * EXT3_SINGLEDATA_TRANS_BLOCKS for the quota files
+ */
+static int ext3_credits_needed(struct super_block *sb, int objcount,
+ struct obd_ioobj *obj)
+{
+ struct obd_ioobj *o = obj;
+ int blockpp = 1 << (PAGE_CACHE_SHIFT - sb->s_blocksize_bits);
+ int addrpp = EXT3_ADDR_PER_BLOCK(sb) * blockpp;
+ int nbitmaps = 0;
+ int ngdblocks = 0;
+ int needed = objcount + 1;
+ int i;
+
+ for (i = 0; i < objcount; i++, o++) {
+ int nblocks = o->ioo_bufcnt * blockpp;
+ int ndindirect = min(nblocks, addrpp + 1);
+ int nindir = nblocks + ndindirect + 1;
+
+ nbitmaps += nindir + nblocks;
+ ngdblocks += nindir + nblocks;
+
+ needed += nindir;
+ }
+
+ if (nbitmaps > EXT3_SB(sb)->s_groups_count)
+ nbitmaps = EXT3_SB(sb)->s_groups_count;
+ if (ngdblocks > EXT3_SB(sb)->s_gdb_count)
+ ngdblocks = EXT3_SB(sb)->s_gdb_count;
+
+ needed += nbitmaps + ngdblocks;
+
+#ifdef CONFIG_QUOTA
+ /* We assume that there will be 1 bit set in s_dquot.flags for each
+ * quota file that is active. This is at least true for now.
+ */
+ needed += hweight32(sb_any_quota_enabled(sb)) *
+ EXT3_SINGLEDATA_TRANS_BLOCKS;
+#endif
+
+ return needed;
}
-int filter_preprw(int cmd, struct obd_conn *conn,
- int objcount, struct obd_ioobj *obj,
- int niocount, struct niobuf *nb,
- struct niobuf *res)
+/* We have to start a huge journal transaction here to hold all of the
+ * metadata for the pages being written here. This is necessitated by
+ * the fact that we do lots of prepare_write operations before we do
+ * any of the matching commit_write operations, so even if we split
+ * up to use "smaller" transactions none of them could complete until
+ * all of them were opened. By having a single journal transaction,
+ * we eliminate duplicate reservations for common blocks like the
+ * superblock and group descriptors or bitmaps.
+ *
+ * We will start the transaction here, but each prepare_write will
+ * add a refcount to the transaction, and each commit_write will
+ * remove a refcount. The transaction will be closed when all of
+ * the pages have been written.
+ */
+static void *ext3_filter_journal_start(struct filter_obd *filter,
+ int objcount, struct obd_ioobj *obj,
+ int niocount, struct niobuf_remote *nb)
{
- int i, j;
- struct obd_ioobj *o;
- struct niobuf *b;
- struct niobuf *r;
- struct inode *inode;
+ journal_t *journal = NULL;
+ handle_t *handle = NULL;
+ int needed;
+
+ /* Assumes ext3 and extN have same sb_info layout, but avoids issues
+ * with having extN built properly before filterobd for now.
+ */
+ journal = EXT3_SB(filter->fo_sb)->s_journal;
+ needed = ext3_credits_needed(filter->fo_sb, objcount, obj);
+
+ /* The number of blocks we could _possibly_ dirty can very large.
+ * We reduce our request if it is absurd (and we couldn't get that
+ * many credits for a single handle anyways).
+ *
+ * At some point we have to limit the size of I/Os sent at one time,
+ * increase the size of the journal, or we have to calculate the
+ * actual journal requirements more carefully by checking all of
+ * the blocks instead of being maximally pessimistic. It remains to
+ * be seen if this is a real problem or not.
+ */
+ if (needed > journal->j_max_transaction_buffers) {
+ CERROR("want too many journal credits (%d) using %d instead\n",
+ needed, journal->j_max_transaction_buffers);
+ needed = journal->j_max_transaction_buffers;
+ }
+
+ handle = journal_start(journal, needed);
+ if (IS_ERR(handle))
+ CERROR("can't get handle for %d credits: rc = %ld\n", needed,
+ PTR_ERR(handle));
+
+ return(handle);
+}
+
+static void *filter_journal_start(void **journal_save,
+ struct filter_obd *filter,
+ int objcount, struct obd_ioobj *obj,
+ int niocount, struct niobuf_remote *nb)
+{
+ void *handle = NULL;
+
+ /* This may not be necessary - we probably never have a
+ * transaction started when we enter here, so we can
+ * remove the saving of the journal state entirely.
+ * For now leave it in just to see if it ever happens.
+ */
+ *journal_save = current->journal_info;
+ if (*journal_save) {
+ CERROR("Already have handle %p???\n", *journal_save);
+ LBUG();
+ current->journal_info = NULL;
+ }
+
+ if (!strcmp(filter->fo_fstype, "ext3") ||
+ !strcmp(filter->fo_fstype, "extN"))
+ handle = ext3_filter_journal_start(filter, objcount, obj,
+ niocount, nb);
+ return handle;
+}
+
+static int ext3_filter_journal_stop(void *handle)
+{
+ int rc;
+
+ /* We got a refcount on the handle for each call to prepare_write,
+ * so we can drop the "parent" handle here to avoid the need for
+ * osc to call back into filterobd to close the handle. The
+ * remaining references will be dropped in commit_write.
+ */
+ rc = journal_stop((handle_t *)handle);
+
+ return rc;
+}
+
+static int filter_journal_stop(void *journal_save, struct filter_obd *filter,
+ void *handle)
+{
+ int rc = 0;
+
+ if (!strcmp(filter->fo_fstype, "ext3") ||
+ !strcmp(filter->fo_fstype, "extN"))
+ rc = ext3_filter_journal_stop(handle);
+
+ if (rc)
+ CERROR("error on journal stop: rc = %d\n", rc);
+
+ current->journal_info = journal_save;
+
+ return rc;
+}
+
+struct page *filter_get_page_write(struct inode *inode, unsigned long index,
+ struct niobuf_local *lnb)
+{
+ struct address_space *mapping = inode->i_mapping;
struct page *page;
+ int rc;
+
+ //ASSERT_PAGE_INDEX(index, GOTO(err, rc = -EINVAL));
+ page = grab_cache_page_nowait(mapping, index); /* locked page */
+
+ /* This page is currently locked, so get a temporary page instead */
+ if (!page) {
+ unsigned long addr;
+ CDEBUG(D_PAGE, "ino %ld page %ld locked\n", inode->i_ino,index);
+ addr = __get_free_pages(GFP_KERNEL, 0); /* locked page */
+ if (!addr) {
+ CERROR("no memory for a temp page\n");
+ LBUG();
+ GOTO(err, rc = -ENOMEM);
+ }
+ page = virt_to_page(addr);
+ kmap(page);
+ page->index = index;
+ lnb->flags |= N_LOCAL_TEMP_PAGE;
+ } else if (!IS_ERR(page)) {
+ /* Note: Called with "O" and "PAGE_SIZE" this is essentially
+ * a no-op for most filesystems, because we write the whole
+ * page. For partial-page I/O this will read in the page.
+ */
+ kmap(page);
+ rc = mapping->a_ops->prepare_write(NULL, page, 0, PAGE_SIZE);
+ if (rc) {
+ CERROR("page index %lu, rc = %d\n", index, rc);
+ if (rc != -ENOSPC)
+ LBUG();
+ GOTO(err_unlock, rc);
+ }
+ /* XXX not sure if we need this if we are overwriting page */
+ if (PageError(page)) {
+ CERROR("error on page index %lu, rc = %d\n", index, rc);
+ LBUG();
+ GOTO(err_unlock, rc = -EIO);
+ }
+ }
+ return page;
+
+err_unlock:
+ unlock_page(page);
+ lustre_put_page(page);
+err:
+ return ERR_PTR(rc);
+}
+
+/*
+ * We need to balance prepare_write() calls with commit_write() calls.
+ * If the page has been prepared, but we have no data for it, we don't
+ * want to overwrite valid data on disk, but we still need to zero out
+ * data for space which was newly allocated. Like part of what happens
+ * in __block_prepare_write() for newly allocated blocks.
+ *
+ * XXX currently __block_prepare_write() creates buffers for all the
+ * pages, and the filesystems mark these buffers as BH_New if they
+ * were newly allocated from disk. We use the BH_New flag similarly.
+ */
+static int filter_commit_write(struct page *page, unsigned from, unsigned to,
+ int err)
+{
+ if (err) {
+ unsigned block_start, block_end;
+ struct buffer_head *bh, *head = page->buffers;
+ unsigned blocksize = head->b_size;
+ void *addr = page_address(page);
+
+ /* Currently one buffer per page, but in the future... */
+ for (bh = head, block_start = 0; bh != head || !block_start;
+ block_start = block_end, bh = bh->b_this_page) {
+ block_end = block_start + blocksize;
+ if (buffer_new(bh))
+ memset(addr + block_start, 0, blocksize);
+ }
+ }
+
+ return lustre_commit_write(page, from, to);
+}
+
+static int filter_preprw(int cmd, struct lustre_handle *conn,
+ int objcount, struct obd_ioobj *obj,
+ int niocount, struct niobuf_remote *nb,
+ struct niobuf_local *res, void **desc_private)
+{
+ struct obd_run_ctxt saved;
+ struct obd_device *obd;
+ struct obd_ioobj *o = obj;
+ struct niobuf_remote *b = nb;
+ struct niobuf_local *r = res;
+ void *journal_save = NULL;
int rc = 0;
+ int i;
ENTRY;
memset(res, 0, sizeof(*res) * niocount);
+ obd = class_conn2obd(conn);
- for (i=0; i < objcount; i++) {
- o = obj;
- obj++;
- for (j = 0 ; j < o->ioo_bufcnt ; j++) {
- b = nb;
- r = res;
- nb++;
- res++;
-
- inode = ioobj_to_inode(conn, o);
- if (!inode) {
- EXIT;
- /* FIXME: we need to iput all of previous inodes */
- return -EINVAL;
- }
+ push_ctxt(&saved, &obd->u.filter.fo_ctxt);
- page = lustre_get_page(inode, b->offset >> PAGE_SHIFT);
- if (IS_ERR(page)) {
- EXIT;
- return PTR_ERR(page);
- }
- if (cmd == OBD_BRW_WRITE) {
- rc = lustre_prepare_page(0, PAGE_SIZE, page);
- }
- if (rc) {
- CERROR("i %d j %d objcount %d bufcnt %d , rc %d, offset %Ld\n", i, j, objcount, o->ioo_bufcnt, rc, b->offset);
+ if (cmd & OBD_BRW_WRITE) {
+ *desc_private = filter_journal_start(&journal_save,
+ &obd->u.filter,
+ objcount, obj, niocount,
+ nb);
+ if (IS_ERR(*desc_private))
+ GOTO(out_ctxt, rc = PTR_ERR(*desc_private));
+ }
+
+ for (i = 0; i < objcount; i++, o++) {
+ struct dentry *dentry;
+ struct inode *inode;
+ int j;
+
+ dentry = filter_fid2dentry(obd,
+ filter_parent(obd, S_IFREG),
+ o->ioo_id, S_IFREG);
+ if (IS_ERR(dentry))
+ GOTO(out_clean, rc = PTR_ERR(dentry));
+ inode = dentry->d_inode;
+ if (!inode) {
+ CERROR("trying to BRW to non-existent file %Ld\n",
+ (unsigned long long)o->ioo_id);
+ dput(dentry);
+ GOTO(out_clean, rc = -ENOENT);
+ }
+
+ for (j = 0; j < o->ioo_bufcnt; j++, b++, r++) {
+ unsigned long index = b->offset >> PAGE_SHIFT;
+ struct page *page;
+
+ if (j == 0)
+ r->dentry = dentry;
+ else
+ r->dentry = dget(dentry);
+
+ if (cmd & OBD_BRW_WRITE)
+ page = filter_get_page_write(inode, index, r);
+ else
+ page = lustre_get_page_read(inode, index);
+
+ if (IS_ERR(page)) {
+ dput(dentry);
+ GOTO(out_clean, rc = PTR_ERR(page));
}
-
- r->addr = (__u64)(unsigned long)page_address(page);
+
+ r->addr = page_address(page);
r->offset = b->offset;
r->page = page;
r->len = PAGE_SIZE;
- /* r->flags */
}
}
- return 0;
+
+out_stop:
+ if (cmd & OBD_BRW_WRITE) {
+ int err = filter_journal_stop(journal_save, &obd->u.filter,
+ *desc_private);
+ if (!rc)
+ rc = err;
+ }
+out_ctxt:
+ pop_ctxt(&saved);
+ RETURN(rc);
+out_clean:
+ while (r-- > res) {
+ dput(r->dentry);
+ if (cmd & OBD_BRW_WRITE)
+ filter_commit_write(r->page, 0, PAGE_SIZE, rc);
+ else
+ lustre_put_page(r->page);
+ }
+ goto out_stop;
}
-int filter_commitrw(int cmd, struct obd_conn *conn,
- int objcount, struct obd_ioobj *obj,
- int niocount, struct niobuf *res)
+static int filter_write_locked_page(struct niobuf_local *lnb)
{
- int i, j;
+ struct page *lpage;
int rc;
- struct inode *inode;
- struct obd_ioobj *o;
- struct niobuf *r = NULL;
- ENTRY;
- for (i=0; i < objcount; i++) {
- o = obj;
- obj++;
+ lpage = lustre_get_page_write(lnb->dentry->d_inode, lnb->page->index);
+ if (IS_ERR(lpage)) {
+ /* It is highly unlikely that we would ever get an error here.
+ * The page we want to get was previously locked, so it had to
+ * have already allocated the space, and we were just writing
+ * over the same data, so there would be no hole in the file.
+ *
+ * XXX: possibility of a race with truncate could exist, need
+ * to check that. There are no guarantees w.r.t.
+ * write order even on a local filesystem, although the
+ * normal response would be to return the number of bytes
+ * successfully written and leave the rest to the app.
+ */
+ rc = PTR_ERR(lpage);
+ CERROR("error getting locked page index %ld: rc = %d\n",
+ lnb->page->index, rc);
+ GOTO(out, rc);
+ }
- for (j = 0 ; j < o->ioo_bufcnt ; j++) {
- r = res;
- if (!r)
- LBUG();
- res++;
+ memcpy(page_address(lpage), kmap(lnb->page), PAGE_SIZE);
+ rc = lustre_commit_write(lpage, 0, PAGE_SIZE);
+ if (rc)
+ CERROR("error committing locked page %ld: rc = %d\n",
+ lnb->page->index, rc);
+out:
+ kunmap(lnb->page);
+ __free_pages(lnb->page, 0);
+ dput(lnb->dentry);
- if (!r)
+ return rc;
+}
+
+static int filter_commitrw(int cmd, struct lustre_handle *conn,
+ int objcount, struct obd_ioobj *obj,
+ int niocount, struct niobuf_local *res,
+ void *private)
+{
+ struct obd_run_ctxt saved;
+ struct obd_ioobj *o = obj;
+ struct niobuf_local *r = res;
+ struct obd_device *obd = class_conn2obd(conn);
+ void *journal_save;
+ int found_locked = 0;
+ int rc = 0;
+ int i;
+ ENTRY;
+
+ push_ctxt(&saved, &obd->u.filter.fo_ctxt);
+ journal_save = current->journal_info;
+ if (journal_save)
+ CERROR("Existing handle %p???\n", journal_save);
+ current->journal_info = private;
+ for (i = 0; i < objcount; i++, obj++) {
+ int j;
+ for (j = 0 ; j < o->ioo_bufcnt ; j++, r++) {
+ struct page *page = r->page;
+
+ if (!page)
LBUG();
- if (cmd == OBD_BRW_WRITE)
- rc = lustre_commit_page(r->page, 0, PAGE_SIZE);
- else {
- lustre_put_page(r->page);
- rc = 0;
+ if (r->flags & N_LOCAL_TEMP_PAGE) {
+ found_locked = 1;
+ continue;
}
- if (rc) {
- EXIT;
- return rc;
- }
- inode = ((struct page *)r->page)->mapping->host;
- iput(inode);
+ if (cmd & OBD_BRW_WRITE) {
+ int err = filter_commit_write(page, 0,
+ PAGE_SIZE, 0);
+
+ if (!rc)
+ rc = err;
+ } else
+ lustre_put_page(page);
+
+ CDEBUG(D_INODE,
+ "put inode %p (%ld), count = %d, nlink = %d\n",
+ page->mapping->host,
+ page->mapping->host->i_ino,
+ atomic_read(&page->mapping->host->i_count) - 1,
+ page->mapping->host->i_nlink);
+ dput(r->dentry);
}
}
- return 0;
+ if (!found_locked)
+ goto out_ctxt;
+
+ for (i = 0; i < objcount; i++, obj++) {
+ int j;
+ for (j = 0 ; j < o->ioo_bufcnt ; j++, r++) {
+ int err;
+ if (!(r->flags & N_LOCAL_TEMP_PAGE))
+ continue;
+
+ err = filter_write_locked_page(r);
+ if (!rc)
+ rc = err;
+ }
+ }
+
+out_ctxt:
+ current->journal_info = journal_save;
+ pop_ctxt(&saved);
+ RETURN(0);
}
-static int filter_statfs (struct obd_conn *conn, struct statfs * statfs)
+static int filter_statfs(struct lustre_handle *conn, struct statfs * statfs)
{
struct super_block *sb;
int err;
-
ENTRY;
- if (!gen_client(conn)) {
- CDEBUG(D_IOCTL, "invalid client %u\n", conn->oc_id);
- EXIT;
- return -EINVAL;
+ if (!class_conn2export(conn)) {
+ CDEBUG(D_IOCTL, "invalid client %Lx\n", conn->addr);
+ RETURN(-EINVAL);
}
- sb = conn->oc_dev->u.filter.fo_sb;
+ sb = class_conn2obd(conn)->u.filter.fo_sb;
err = sb->s_op->statfs(sb, statfs);
- EXIT;
- return err;
-} /* ext2obd_statfs */
+ RETURN(err);
+} /* filter_statfs */
-static int filter_get_info(struct obd_conn *conn, obd_count keylen,
- void *key, obd_count *vallen, void **val)
+static int filter_get_info(struct lustre_handle *conn, obd_count keylen,
+ void *key, obd_count *vallen, void **val)
{
- struct obd_device *obddev;
- struct obd_client * cli;
+ struct obd_device *obd;
+ struct obd_export * export;
ENTRY;
- if (!(cli = gen_client(conn))) {
- CDEBUG(D_IOCTL, "invalid client %u\n", conn->oc_id);
- return -EINVAL;
+ if (!(export = class_conn2export(conn))) {
+ CDEBUG(D_IOCTL, "invalid client %Lx\n", conn->addr);
+ RETURN(-EINVAL);
}
- obddev = conn->oc_dev;
-
+ obd = class_conn2obd(conn);
+
if ( keylen == strlen("blocksize") &&
memcmp(key, "blocksize", keylen) == 0 ) {
- *vallen = sizeof(int);
- *val = (void *)obddev->u.filter.fo_sb->s_blocksize;
- EXIT;
- return 0;
+ *vallen = sizeof(long);
+ *val = (void *)(long)obd->u.filter.fo_sb->s_blocksize;
+ RETURN(0);
}
if ( keylen == strlen("blocksize_bits") &&
memcmp(key, "blocksize_bits", keylen) == 0 ){
- *vallen = sizeof(int);
- *val = (void *)(int)obddev->u.filter.fo_sb->s_blocksize_bits;
- EXIT;
- return 0;
+ *vallen = sizeof(long);
+ *val = (void *)(long)obd->u.filter.fo_sb->s_blocksize_bits;
+ RETURN(0);
}
if ( keylen == strlen("root_ino") &&
memcmp(key, "root_ino", keylen) == 0 ){
- *vallen = sizeof(int);
- *val = (void *)(int) FILTER_ROOTINO;
- EXIT;
- return 0;
+ *vallen = sizeof(long);
+ *val = (void *)(long)FILTER_ROOTINO;
+ RETURN(0);
}
-
+
CDEBUG(D_IOCTL, "invalid key\n");
- return -EINVAL;
+ RETURN(-EINVAL);
+}
+
+int filter_copy_data(struct lustre_handle *dst_conn, struct obdo *dst,
+ struct lustre_handle *src_conn, struct obdo *src,
+ obd_size count, obd_off offset)
+{
+ struct page *page;
+ unsigned long index = 0;
+ int err = 0;
+
+ ENTRY;
+ CDEBUG(D_INFO, "src: ino %Ld blocks %Ld, size %Ld, dst: ino %Ld\n",
+ (unsigned long long)src->o_id, (unsigned long long)src->o_blocks,
+ (unsigned long long)src->o_size, (unsigned long long)dst->o_id);
+ page = alloc_page(GFP_USER);
+ if (page == NULL)
+ RETURN(-ENOMEM);
+
+ while (TryLockPage(page))
+ ___wait_on_page(page);
+
+ /* XXX with brw vector I/O, we could batch up reads and writes here,
+ * all we need to do is allocate multiple pages to handle the I/Os
+ * and arrays to handle the request parameters.
+ */
+ while (index < ((src->o_size + PAGE_SIZE - 1) >> PAGE_SHIFT)) {
+ obd_count num_oa = 1;
+ obd_count num_buf = 1;
+ obd_size brw_count = PAGE_SIZE;
+ obd_off brw_offset = (page->index) << PAGE_SHIFT;
+ obd_flag flagr = 0;
+ obd_flag flagw = OBD_BRW_CREATE;
+
+ page->index = index;
+ err = obd_brw(OBD_BRW_READ, src_conn, num_oa, &src, &num_buf,
+ &page, &brw_count, &brw_offset, &flagr, NULL);
+
+ if ( err ) {
+ EXIT;
+ break;
+ }
+ CDEBUG(D_INFO, "Read page %ld ...\n", page->index);
+
+ err = obd_brw(OBD_BRW_WRITE, dst_conn, num_oa, &dst, &num_buf,
+ &page, &brw_count, &brw_offset, &flagw, NULL);
+
+ /* XXX should handle dst->o_size, dst->o_blocks here */
+ if ( err ) {
+ EXIT;
+ break;
+ }
+
+ CDEBUG(D_INFO, "Wrote page %ld ...\n", page->index);
+
+ index++;
+ }
+ dst->o_size = src->o_size;
+ dst->o_blocks = src->o_blocks;
+ dst->o_valid |= (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS);
+ UnlockPage(page);
+ __free_page(page);
+
+ RETURN(err);
}
-struct obd_ops filter_obd_ops = {
- o_iocontrol: NULL,
+static struct obd_ops filter_obd_ops = {
o_get_info: filter_get_info,
o_setup: filter_setup,
o_cleanup: filter_cleanup,
o_create: filter_create,
o_setattr: filter_setattr,
o_destroy: filter_destroy,
- o_read: filter_read,
- o_write: filter_write,
+ o_open: filter_open,
+ o_close: filter_close,
o_brw: filter_pgcache_brw,
o_punch: filter_truncate,
o_preprw: filter_preprw,
o_commitrw: filter_commitrw
#if 0
- o_preallocate: ext2obd_preallocate_inodes,
- o_migrate: ext2obd_migrate,
- o_copy: gen_copy_data,
- o_iterate: ext2obd_iterate
+ o_preallocate: filter_preallocate_inodes,
+ o_migrate: filter_migrate,
+ o_copy: filter_copy_data,
+ o_iterate: filter_iterate
#endif
};
static int __init obdfilter_init(void)
{
printk(KERN_INFO "Filtering OBD driver v0.001, braam@clusterfs.com\n");
- return obd_register_type(&filter_obd_ops, OBD_FILTER_DEVICENAME);
+ return class_register_type(&filter_obd_ops, OBD_FILTER_DEVICENAME);
}
static void __exit obdfilter_exit(void)
{
- obd_unregister_type(OBD_FILTER_DEVICENAME);
+ class_unregister_type(OBD_FILTER_DEVICENAME);
}
MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
MODULE_DESCRIPTION("Lustre Filtering OBD driver v1.0");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL");
module_init(obdfilter_init);
module_exit(obdfilter_exit);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff