lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch

   1  fs/ext3/inode.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
   2  fs/ext3/super.c |    3 +++
   3  2 files changed, 55 insertions(+)
   4
   5 Index: linux-2.6.0/fs/ext3/inode.c
   6 ===================================================================
   7 --- linux-2.6.0.orig/fs/ext3/inode.c    2003-12-31 00:33:49.000000000 +0300
   8 +++ linux-2.6.0/fs/ext3/inode.c 2003-12-31 01:14:17.000000000 +0300
   9 @@ -3136,3 +3136,58 @@
  10                 ret = ret2;
  11         return ret;
  12  }
  13 +
  14 +int ext3_map_inode_page(struct inode *inode, struct page *page,
  15 +                        unsigned long *blocks, int *created, int create)
  16 +{
  17 +        unsigned int blocksize, blocks_per_page;
  18 +        unsigned long iblock;
  19 +        struct buffer_head dummy;
  20 +        void *handle;
  21 +        int i, rc = 0, failed = 0, needed_blocks;
  22 +
  23 +        blocksize = inode->i_sb->s_blocksize;
  24 +        blocks_per_page = PAGE_SIZE >> inode->i_sb->s_blocksize_bits;
  25 +        iblock = page->index * blocks_per_page;
  26 +
  27 +        for (i = 0; i < blocks_per_page; i++, iblock++) {
  28 +                blocks[i] = ext3_bmap(inode->i_mapping, iblock);
  29 +                if (blocks[i] == 0) {
  30 +                        failed++;
  31 +                        created[i] = -1;
  32 +                } else {
  33 +                        created[i] = 0;
  34 +                }
  35 +        }
  36 +
  37 +        if (failed == 0 || create == 0)
  38 +                return 0;
  39 +
  40 +        needed_blocks = ext3_writepage_trans_blocks(inode);
  41 +        handle = ext3_journal_start(inode, needed_blocks);
  42 +        if (IS_ERR(handle))
  43 +                return PTR_ERR(handle);
  44 +
  45 +        iblock = page->index * blocks_per_page;
  46 +        for (i = 0; i < blocks_per_page; i++, iblock++) {
  47 +                if (blocks[i] != 0)
  48 +                        continue;
  49 +
  50 +                rc = ext3_get_block_handle(handle, inode, iblock, &dummy, 1, 1);
  51 +                if (rc) {
  52 +                        printk(KERN_INFO "ext3_map_inode_page: error reading "
  53 +                               "block %ld\n", iblock);
  54 +                        goto out;
  55 +                }
  56 +                if (buffer_new(&dummy))
  57 +                        unmap_underlying_metadata(dummy.b_bdev,
  58 +                                                       dummy.b_blocknr);
  59 +                blocks[i] = dummy.b_blocknr;
  60 +                created[i] = 1;
  61 +        }
  62 +
  63 + out:
  64 +       ext3_journal_stop(handle);
  65 +        return rc;
  66 +}
  67 +
  68 Index: linux-2.6.0/fs/ext3/super.c
  69 ===================================================================
  70 --- linux-2.6.0.orig/fs/ext3/super.c    2003-12-31 00:33:49.000000000 +0300
  71 +++ linux-2.6.0/fs/ext3/super.c 2003-12-31 01:10:40.000000000 +0300
  72 @@ -2051,6 +2051,9 @@
  73  int ext3_prep_san_write(struct inode *inode, long *blocks,
  74                          int nblocks, loff_t newsize);
  75  EXPORT_SYMBOL(ext3_prep_san_write);
  76 +int ext3_map_inode_page(struct inode *inode, struct page *page,
  77 +                        unsigned long *blocks, int *created, int create);
  78 +EXPORT_SYMBOL(ext3_map_inode_page);
  79
  80  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  81  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");