From d170b690770422318ab938bc87817aba3174de54 Mon Sep 17 00:00:00 2001 From: shaver Date: Fri, 25 Jul 2003 23:04:25 +0000 Subject: [PATCH] b=1600: my version of Andreas' patch to use write_record to ensure that the MDS server data is written at creation time b=1597: cope with entering recovery/replay without a preceding timeout We pass this initial single-node/single-mount replay test, yay. --- lustre/include/linux/lustre_fsfilt.h | 8 ++++---- lustre/obdclass/fsfilt_ext3.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h index 37ffc4f5..72b2292 100644 --- a/lustre/include/linux/lustre_fsfilt.h +++ b/lustre/include/linux/lustre_fsfilt.h @@ -61,8 +61,8 @@ struct fsfilt_operations { int (* fs_sync)(struct super_block *sb); int (* fs_prep_san_write)(struct inode *inode, long *blocks, int nblocks, loff_t newsize); - int (* fs_write_record)(struct file *, char *, int size, loff_t *); - int (* fs_read_record)(struct file *, char *, int size, loff_t *); + int (* fs_write_record)(struct file *, void *, int size, loff_t *); + int (* fs_read_record)(struct file *, void *, int size, loff_t *); }; extern int fsfilt_register_ops(struct fsfilt_operations *fs_ops); @@ -206,13 +206,13 @@ static inline int fs_prep_san_write(struct obd_device *obd, } static inline int fsfilt_read_record(struct obd_device *obd, struct file *file, - char *buf, loff_t size, loff_t *offs) + void *buf, loff_t size, loff_t *offs) { return obd->obd_fsops->fs_read_record(file, buf, size, offs); } static inline int fsfilt_write_record(struct obd_device *obd, struct file *file, - char *buf, loff_t size, loff_t *offs) + void *buf, loff_t size, loff_t *offs) { return obd->obd_fsops->fs_write_record(file, buf, size, offs); } diff --git a/lustre/obdclass/fsfilt_ext3.c b/lustre/obdclass/fsfilt_ext3.c index 5dd196d..eca44d0 100644 --- a/lustre/obdclass/fsfilt_ext3.c +++ b/lustre/obdclass/fsfilt_ext3.c @@ -515,7 +515,7 @@ static int fsfilt_ext3_prep_san_write(struct inode *inode, long *blocks, return ext3_prep_san_write(inode, blocks, nblocks, newsize); } -static int fsfilt_ext3_read_record(struct file * file, char *buf, +static int fsfilt_ext3_read_record(struct file * file, void *buf, int size, loff_t *offs) { struct buffer_head *bh; @@ -550,7 +550,7 @@ static int fsfilt_ext3_read_record(struct file * file, char *buf, return size; } -static int fsfilt_ext3_write_record(struct file * file, char *buf, +static int fsfilt_ext3_write_record(struct file * file, void *buf, int size, loff_t *offs) { struct buffer_head *bh; -- 1.8.3.1