From: shaver <shaver>
Date: Mon, 14 Jul 2003 22:32:57 +0000 (+0000)
Subject: revert mmex's accidental checkin
X-Git-Tag: v1_7_100~1^368~77
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=47663aaf035a6c4cb46a3a32741f0ab1486f1f65;p=fs%2Flustre-release.git

revert mmex's accidental checkin
---

diff --git a/lustre/obdclass/fsfilt_ext3.c b/lustre/obdclass/fsfilt_ext3.c
index bff78a1..a3b295f 100644
--- a/lustre/obdclass/fsfilt_ext3.c
+++ b/lustre/obdclass/fsfilt_ext3.c
@@ -501,78 +501,6 @@ 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,
-                                        loff_t size, loff_t *offs)
-{
-        struct buffer_head *bh;
-        unsigned long block, boffs;
-        struct inode *inode = file->f_dentry->d_inode;
-        int err;
-
-        if (inode->i_size < *offs + size)
-                return -EIO;
-
-        block = *offs >> inode->i_blkbits;
-        bh = ext3_bread(NULL, inode, block, 0, &err);
-        if (!bh)
-                return err;
-
-        boffs = (unsigned) *offs / bh->b_size;
-        if (boffs + size > bh->b_size) {
-                brelse(bh);
-                return -EIO;
-        }
-
-        memcpy(buf, bh->b_data + boffs, size);
-        brelse(bh);
-        *offs += size;
-        return size;
-}
-
-static int fsfilt_ext3_write_record(struct file * file, char * buf,
-                                        loff_t size, loff_t *offs)
-{
-        struct buffer_head *bh;
-        unsigned long block, boffs;
-        struct inode *inode = file->f_dentry->d_inode;
-        handle_t *handle;
-        int err;
-
-        handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS + 2);
-        if (!handle)
-                return -EIO;
-        
-        block = *offs >> inode->i_blkbits;
-        if (block > inode->i_size >> inode->i_blkbits) {
-                down(&inode->i_sem);
-                inode->i_size = block << inode->i_blkbits;
-                up(&inode->i_sem);
-        }
-        bh = ext3_bread(handle, inode, block, 1, &err);
-        if (!bh)
-                goto out;
-
-        boffs = (unsigned) *offs / bh->b_size;
-        if (boffs + size > bh->b_size)
-                goto out;
-
-        err = ext3_journal_get_write_access(handle, bh);
-        if (err)
-               goto out; 
-        memcpy(bh->b_data + boffs, buf, size);
-        err = ext3_journal_dirty_metadata(handle, bh);
-        if (err)
-               goto out; 
-        err = size;
-out:
-        if (bh)
-                brelse(bh);
-        ext3_journal_stop(handle, inode);
-        if (err > 0)
-                *offs += size;
-        return err;
-}
-
 static struct fsfilt_operations fsfilt_ext3_ops = {
         fs_type:                "ext3",
         fs_owner:               THIS_MODULE,
@@ -588,8 +516,6 @@ static struct fsfilt_operations fsfilt_ext3_ops = {
         fs_statfs:              fsfilt_ext3_statfs,
         fs_sync:                fsfilt_ext3_sync,
         fs_prep_san_write:      fsfilt_ext3_prep_san_write,
-        fs_write_record:        fsfilt_ext3_write_record,
-        fs_read_record:         fsfilt_ext3_read_record,
 };
 
 static int __init fsfilt_ext3_init(void)