Skip to content
Snippets Groups Projects
Commit 0317092c authored by alex's avatar alex
Browse files

- ext3_ext_new_extent_cb() unmaps buffer_heads in order to prevent 

  cache-aliasing problems
- ext3_forget() should be used in conjuction with ext3_free_blocks()

NOTE: 2.4.24 + extents + batching block allocation passes data-consistency
      tests now (at least I haven't seen problems for many hours of testing)
parent 1cb70fff
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lustre/kernel_patches/patches/ext3-extents-2.4.20.patch
+ 26
− 7
View file @ 0317092c
Index: linux-2.4.24/fs/ext3/extents.c
===================================================================
--- linux-2.4.24.orig/fs/ext3/extents.c 2003-01-30 13:24:37.000000000 +0300
+++ linux-2.4.24/fs/ext3/extents.c 2004-01-29 16:18:31.000000000 +0300
@@ -0,0 +1,2302 @@
+++ linux-2.4.24/fs/ext3/extents.c 2004-01-30 19:26:55.000000000 +0300
@@ -0,0 +1,2321 @@
+/*
+ * Copyright (C) 2003 Alex Tomas <alex@clusterfs.com>
+ *
......@@ -1375,7 +1375,7 @@ Index: linux-2.4.24/fs/ext3/extents.c
+ ext_debug(tree, "index is empty, remove it, free block %d\n",
+ path->p_idx->e_leaf);
+ bh = sb_get_hash_table(tree->inode->i_sb, path->p_idx->e_leaf);
+ ext3_forget(handle, 0, tree->inode, bh, path->p_idx->e_leaf);
+ ext3_forget(handle, 1, tree->inode, bh, path->p_idx->e_leaf);
+ ext3_free_blocks(handle, tree->inode, path->p_idx->e_leaf, 1);
+ return err;
+}
......@@ -1831,6 +1831,8 @@ Index: linux-2.4.24/fs/ext3/extents.c
+{
+ int needed = ext3_remove_blocks_credits(tree, ex, from, to);
+ handle_t *handle = ext3_journal_start(tree->inode, needed);
+ struct buffer_head *bh;
+ int i;
+
+ if (IS_ERR(handle))
+ return PTR_ERR(handle);
......@@ -1841,6 +1843,10 @@ Index: linux-2.4.24/fs/ext3/extents.c
+ start = ex->e_start + ex->e_num - num;
+ ext_debug(tree, "free last %lu blocks starting %lu\n",
+ num, start);
+ for (i = 0; i < num; i++) {
+ bh = sb_get_hash_table(tree->inode->i_sb, start + i);
+ ext3_forget(handle, 0, tree->inode, bh, start + i);
+ }
+ ext3_free_blocks(handle, tree->inode, start, num);
+ } else if (from == ex->e_block && to <= ex->e_block + ex->e_num - 1) {
+ printk("strange request: removal %lu-%lu from %u:%u\n",
......@@ -1934,11 +1940,13 @@ Index: linux-2.4.24/fs/ext3/extents.c
+ struct ext3_extent *newex, int exist)
+{
+ struct inode *inode = tree->inode;
+ struct buffer_head *bh;
+ int count, err, goal;
+ loff_t new_i_size;
+ handle_t *handle;
+ unsigned long pblock;
+ unsigned long tgen;
+ loff_t new_i_size;
+ handle_t *handle;
+ int i;
+
+ if (exist)
+ return EXT_CONTINUE;
......@@ -1975,6 +1983,17 @@ Index: linux-2.4.24/fs/ext3/extents.c
+ if (err)
+ goto out;
+
+ /* block have been allocated for data, so time to drop dirty
+ * in correspondend buffer_heads to prevent corruptions */
+ for (i = 0; i < newex->e_num; i++) {
+ bh = sb_get_hash_table(inode->i_sb, newex->e_start + i);
+ if (bh) {
+ mark_buffer_clean(bh);
+ wait_on_buffer(bh);
+ clear_bit(BH_Req, &bh->b_state);
+ __brelse(bh);
+ }
+ }
+
+ /* correct on-disk inode size */
+ if (newex->e_num > 0) {
......@@ -2473,7 +2492,7 @@ Index: linux-2.4.24/fs/ext3/ioctl.c
Index: linux-2.4.24/include/linux/ext3_fs.h
===================================================================
--- linux-2.4.24.orig/include/linux/ext3_fs.h 2004-01-14 02:58:45.000000000 +0300
+++ linux-2.4.24/include/linux/ext3_fs.h 2004-01-26 23:17:19.000000000 +0300
+++ linux-2.4.24/include/linux/ext3_fs.h 2004-01-30 00:09:37.000000000 +0300
@@ -184,6 +184,7 @@
#define EXT3_IMAGIC_FL 0x00002000 /* AFS directory */
#define EXT3_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */
......@@ -2527,7 +2546,7 @@ Index: linux-2.4.24/include/linux/ext3_fs.h
Index: linux-2.4.24/include/linux/ext3_extents.h
===================================================================
--- linux-2.4.24.orig/include/linux/ext3_extents.h 2003-01-30 13:24:37.000000000 +0300
+++ linux-2.4.24/include/linux/ext3_extents.h 2004-01-29 01:13:10.000000000 +0300
+++ linux-2.4.24/include/linux/ext3_extents.h 2004-01-30 18:03:53.000000000 +0300
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2003 Alex Tomas <alex@clusterfs.com>
......
lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch
+ 24
− 5
View file @ 0317092c
Index: linux-2.4.21-suse2/fs/ext3/extents.c
===================================================================
--- linux-2.4.21-suse2.orig/fs/ext3/extents.c 2003-01-30 13:24:37.000000000 +0300
+++ linux-2.4.21-suse2/fs/ext3/extents.c 2004-01-29 16:27:55.000000000 +0300
@@ -0,0 +1,2303 @@
+++ linux-2.4.21-suse2/fs/ext3/extents.c 2004-01-30 19:29:16.000000000 +0300
@@ -0,0 +1,2322 @@
+/*
+ * Copyright (C) 2003 Alex Tomas <alex@clusterfs.com>
+ *
......@@ -1375,7 +1375,7 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c
+ ext_debug(tree, "index is empty, remove it, free block %d\n",
+ path->p_idx->e_leaf);
+ bh = sb_get_hash_table(tree->inode->i_sb, path->p_idx->e_leaf);
+ ext3_forget(handle, 0, tree->inode, bh, path->p_idx->e_leaf);
+ ext3_forget(handle, 1, tree->inode, bh, path->p_idx->e_leaf);
+ ext3_free_blocks(handle, tree->inode, path->p_idx->e_leaf, 1);
+ return err;
+}
......@@ -1831,6 +1831,8 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c
+{
+ int needed = ext3_remove_blocks_credits(tree, ex, from, to);
+ handle_t *handle = ext3_journal_start(tree->inode, needed);
+ struct buffer_head *bh;
+ int i;
+
+ if (IS_ERR(handle))
+ return PTR_ERR(handle);
......@@ -1841,6 +1843,10 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c
+ start = ex->e_start + ex->e_num - num;
+ ext_debug(tree, "free last %lu blocks starting %lu\n",
+ num, start);
+ for (i = 0; i < num; i++) {
+ bh = sb_get_hash_table(tree->inode->i_sb, start + i);
+ ext3_forget(handle, 0, tree->inode, bh, start + i);
+ }
+ ext3_free_blocks(handle, tree->inode, start, num);
+ } else if (from == ex->e_block && to <= ex->e_block + ex->e_num - 1) {
+ printk("strange request: removal %lu-%lu from %u:%u\n",
......@@ -1934,11 +1940,13 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c
+ struct ext3_extent *newex, int exist)
+{
+ struct inode *inode = tree->inode;
+ struct buffer_head *bh;
+ int count, err, goal;
+ loff_t new_i_size;
+ handle_t *handle;
+ unsigned long pblock;
+ unsigned long tgen;
+ loff_t new_i_size;
+ handle_t *handle;
+ int i;
+
+ if (exist)
+ return EXT_CONTINUE;
......@@ -1975,6 +1983,17 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c
+ if (err)
+ goto out;
+
+ /* block have been allocated for data, so time to drop dirty
+ * in correspondend buffer_heads to prevent corruptions */
+ for (i = 0; i < newex->e_num; i++) {
+ bh = sb_get_hash_table(inode->i_sb, newex->e_start + i);
+ if (bh) {
+ mark_buffer_clean(bh);
+ wait_on_buffer(bh);
+ clear_bit(BH_Req, &bh->b_state);
+ __brelse(bh);
+ }
+ }
+
+ /* correct on-disk inode size */
+ if (newex->e_num > 0) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy