From 4ae4b7eee2baf88c7c189792ddc75118d79b03ee Mon Sep 17 00:00:00 2001 From: johann <johann> Date: Fri, 8 Jun 2007 08:39:30 +0000 Subject: [PATCH] Branch b1_6 remove fs_prep_san_write operation b=11039 i=adilger i=nathan --- lustre/include/linux/lustre_fsfilt.h | 9 --------- lustre/lvfs/fsfilt_ext3.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h index 354b45ad9d..a95cc61f47 100644 --- a/lustre/include/linux/lustre_fsfilt.h +++ b/lustre/include/linux/lustre_fsfilt.h @@ -92,8 +92,6 @@ struct fsfilt_operations { int pages, unsigned long *blocks, int *created, int create, struct semaphore *sem); - int (* fs_prep_san_write)(struct inode *inode, long *blocks, - int nblocks, loff_t newsize); int (* fs_write_record)(struct file *, void *, int size, loff_t *, int force_sync); int (* fs_read_record)(struct file *, void *, int size, loff_t *); @@ -432,13 +430,6 @@ static inline int fsfilt_map_inode_pages(struct obd_device *obd, created, create, sem); } -static inline int fs_prep_san_write(struct obd_device *obd, struct inode *inode, - long *blocks, int nblocks, loff_t newsize) -{ - return obd->obd_fsops->fs_prep_san_write(inode, blocks, - nblocks, newsize); -} - static inline int fsfilt_read_record(struct obd_device *obd, struct file *file, void *buf, loff_t size, loff_t *offs) { diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c index f00508925e..90c92ac63c 100644 --- a/lustre/lvfs/fsfilt_ext3.c +++ b/lustre/lvfs/fsfilt_ext3.c @@ -1196,14 +1196,6 @@ int fsfilt_ext3_map_inode_pages(struct inode *inode, struct page **page, return rc; } -extern int ext3_prep_san_write(struct inode *inode, long *blocks, - int nblocks, loff_t newsize); -static int fsfilt_ext3_prep_san_write(struct inode *inode, long *blocks, - int nblocks, loff_t newsize) -{ - return ext3_prep_san_write(inode, blocks, nblocks, newsize); -} - static int fsfilt_ext3_read_record(struct file * file, void *buf, int size, loff_t *offs) { @@ -2098,7 +2090,6 @@ static struct fsfilt_operations fsfilt_ext3_ops = { .fs_statfs = fsfilt_ext3_statfs, .fs_sync = fsfilt_ext3_sync, .fs_map_inode_pages = fsfilt_ext3_map_inode_pages, - .fs_prep_san_write = fsfilt_ext3_prep_san_write, .fs_write_record = fsfilt_ext3_write_record, .fs_read_record = fsfilt_ext3_read_record, .fs_setup = fsfilt_ext3_setup, -- GitLab