Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d628bbf)
Branch b1_6
authorjohann <johann>
Fri, 25 May 2007 13:49:00 +0000 (13:49 +0000)
committerjohann <johann>
Fri, 25 May 2007 13:49:00 +0000 (13:49 +0000)
Use ext3_journal_start/stop (through fsfilt_ext3_journal_start/stop())
instead of journal_start/stop

b=11743
i=alex
i=adilger

ldiskfs/kernel_patches/patches/export-ext3-2.6-rhel4.patch patch | blob | history
ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch patch | blob | history
lustre/ChangeLog patch | blob | history
lustre/kernel_patches/patches/export-ext3-2.6-rhel4.patch patch | blob | history
lustre/kernel_patches/patches/export-ext3-2.6-suse.patch patch | blob | history
lustre/lvfs/fsfilt_ext3.c patch | blob | history

diff --git a/ldiskfs/kernel_patches/patches/export-ext3-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/export-ext3-2.6-rhel4.patch
index 7b4f0c8..9f443b4 100644 (file)
--- a/ldiskfs/kernel_patches/patches/export-ext3-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/export-ext3-2.6-rhel4.patch
@@ -1,8 +1,8 @@
-Index: linux-stage/fs/ext3/super.c
+Index: linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/super.c
 ===================================================================
---- linux-stage.orig/fs/ext3/super.c   2005-02-25 14:50:46.077845320 +0200
-+++ linux-stage/fs/ext3/super.c        2005-02-25 14:51:32.241827328 +0200
-@@ -123,6 +123,8 @@
+--- linux-2.6.9-42.0.10.EL_lustre.1.4.10.orig/fs/ext3/super.c  2007-05-16 08:46:24.000000000 +0200
++++ linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/super.c       2007-05-16 08:48:58.000000000 +0200
+@@ -123,6 +123,8 @@ void ext3_journal_abort_handle(const cha
        journal_abort_handle(handle);
  }
  
@@ -11,7 +11,7 @@ Index: linux-stage/fs/ext3/super.c
  /* Deal with the reporting of failure conditions on a filesystem such as
   * inconsistencies detected or read IO failures.
   *
-@@ -2002,6 +2004,8 @@
+@@ -2064,6 +2066,8 @@ int ext3_force_commit(struct super_block
        return ret;
  }
  
@@ -20,13 +20,15 @@ Index: linux-stage/fs/ext3/super.c
  /*
   * Ext3 always journals updates to the superblock itself, so we don't
   * have to propagate any other updates to the superblock on disk at this
-@@ -2433,6 +2437,10 @@
+@@ -2586,6 +2590,12 @@ int ext3_map_inode_page(struct inode *in
                          unsigned long *blocks, int *created, int create);
  EXPORT_SYMBOL(ext3_map_inode_page);
  
 +EXPORT_SYMBOL(ext3_xattr_get);
 +EXPORT_SYMBOL(ext3_xattr_set_handle);
 +EXPORT_SYMBOL(ext3_bread);
++EXPORT_SYMBOL(ext3_journal_start_sb);
++EXPORT_SYMBOL(__ext3_journal_stop);
 +
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
diff --git a/ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch b/ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch
index 638b4bf..367a051 100644 (file)
--- a/ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch
+++ b/ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch
@@ -1,8 +1,8 @@
-Index: linux-stage/fs/ext3/super.c
+Index: linux-2.6.5-7.283_lustre.1.4.10/fs/ext3/super.c
 ===================================================================
---- linux-stage.orig/fs/ext3/super.c   2004-04-02 16:40:18.000000000 -0500
-+++ linux-stage/fs/ext3/super.c        2004-04-02 16:40:18.000000000 -0500
-@@ -115,6 +115,8 @@
+--- linux-2.6.5-7.283_lustre.1.4.10.orig/fs/ext3/super.c       2007-05-16 08:57:44.000000000 +0200
++++ linux-2.6.5-7.283_lustre.1.4.10/fs/ext3/super.c    2007-05-16 08:59:11.000000000 +0200
+@@ -116,6 +116,8 @@ void ext3_journal_abort_handle(const cha
                handle->h_err = err;
  }
  
@@ -11,7 +11,7 @@ Index: linux-stage/fs/ext3/super.c
  static char error_buf[1024];
  
  /* Deal with the reporting of failure conditions on a filesystem such as
-@@ -1774,6 +1776,8 @@
+@@ -1895,6 +1897,8 @@ int ext3_force_commit(struct super_block
        return ret;
  }
  
@@ -20,13 +20,15 @@ Index: linux-stage/fs/ext3/super.c
  /*
   * Ext3 always journals updates to the superblock itself, so we don't
   * have to propagate any other updates to the superblock on disk at this
-@@ -2088,6 +2092,10 @@
+@@ -2334,6 +2338,12 @@ int ext3_map_inode_page(struct inode *in
                          unsigned long *blocks, int *created, int create);
  EXPORT_SYMBOL(ext3_map_inode_page);
  
 +EXPORT_SYMBOL(ext3_xattr_get);
 +EXPORT_SYMBOL(ext3_xattr_set_handle);
 +EXPORT_SYMBOL(ext3_bread);
++EXPORT_SYMBOL(ext3_journal_start_sb);
++EXPORT_SYMBOL(__ext3_journal_stop);
 +
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index ba4bb86..1cd0b30 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -15,6 +15,14 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * bug fixes
 
 Severity   : normal
+Frequency  : sometimes when underlying device returns I/O errors
+Bugzilla   : 11743
+Description: OSTs not going read-only during write failures
+Details    : OSTs are not remounted read-only when the journal commit threads
+            get I/O errors because fsfilt_ext3 calls journal_start/stop()
+            instead of the ext3 wrappers.
+
+Severity   : normal
 Frequency  : liblustre clients only
 Bugzilla   : 12229
 Description: getdirentries does not give error when run on compute nodes
diff --git a/lustre/kernel_patches/patches/export-ext3-2.6-rhel4.patch b/lustre/kernel_patches/patches/export-ext3-2.6-rhel4.patch
index 7b4f0c8..9f443b4 100644 (file)
--- a/lustre/kernel_patches/patches/export-ext3-2.6-rhel4.patch
+++ b/lustre/kernel_patches/patches/export-ext3-2.6-rhel4.patch
@@ -1,8 +1,8 @@
-Index: linux-stage/fs/ext3/super.c
+Index: linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/super.c
 ===================================================================
---- linux-stage.orig/fs/ext3/super.c   2005-02-25 14:50:46.077845320 +0200
-+++ linux-stage/fs/ext3/super.c        2005-02-25 14:51:32.241827328 +0200
-@@ -123,6 +123,8 @@
+--- linux-2.6.9-42.0.10.EL_lustre.1.4.10.orig/fs/ext3/super.c  2007-05-16 08:46:24.000000000 +0200
++++ linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/super.c       2007-05-16 08:48:58.000000000 +0200
+@@ -123,6 +123,8 @@ void ext3_journal_abort_handle(const cha
        journal_abort_handle(handle);
  }
  
@@ -11,7 +11,7 @@ Index: linux-stage/fs/ext3/super.c
  /* Deal with the reporting of failure conditions on a filesystem such as
   * inconsistencies detected or read IO failures.
   *
-@@ -2002,6 +2004,8 @@
+@@ -2064,6 +2066,8 @@ int ext3_force_commit(struct super_block
        return ret;
  }
  
@@ -20,13 +20,15 @@ Index: linux-stage/fs/ext3/super.c
  /*
   * Ext3 always journals updates to the superblock itself, so we don't
   * have to propagate any other updates to the superblock on disk at this
-@@ -2433,6 +2437,10 @@
+@@ -2586,6 +2590,12 @@ int ext3_map_inode_page(struct inode *in
                          unsigned long *blocks, int *created, int create);
  EXPORT_SYMBOL(ext3_map_inode_page);
  
 +EXPORT_SYMBOL(ext3_xattr_get);
 +EXPORT_SYMBOL(ext3_xattr_set_handle);
 +EXPORT_SYMBOL(ext3_bread);
++EXPORT_SYMBOL(ext3_journal_start_sb);
++EXPORT_SYMBOL(__ext3_journal_stop);
 +
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
diff --git a/lustre/kernel_patches/patches/export-ext3-2.6-suse.patch b/lustre/kernel_patches/patches/export-ext3-2.6-suse.patch
index 638b4bf..367a051 100644 (file)
--- a/lustre/kernel_patches/patches/export-ext3-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/export-ext3-2.6-suse.patch
@@ -1,8 +1,8 @@
-Index: linux-stage/fs/ext3/super.c
+Index: linux-2.6.5-7.283_lustre.1.4.10/fs/ext3/super.c
 ===================================================================
---- linux-stage.orig/fs/ext3/super.c   2004-04-02 16:40:18.000000000 -0500
-+++ linux-stage/fs/ext3/super.c        2004-04-02 16:40:18.000000000 -0500
-@@ -115,6 +115,8 @@
+--- linux-2.6.5-7.283_lustre.1.4.10.orig/fs/ext3/super.c       2007-05-16 08:57:44.000000000 +0200
++++ linux-2.6.5-7.283_lustre.1.4.10/fs/ext3/super.c    2007-05-16 08:59:11.000000000 +0200
+@@ -116,6 +116,8 @@ void ext3_journal_abort_handle(const cha
                handle->h_err = err;
  }
  
@@ -11,7 +11,7 @@ Index: linux-stage/fs/ext3/super.c
  static char error_buf[1024];
  
  /* Deal with the reporting of failure conditions on a filesystem such as
-@@ -1774,6 +1776,8 @@
+@@ -1895,6 +1897,8 @@ int ext3_force_commit(struct super_block
        return ret;
  }
  
@@ -20,13 +20,15 @@ Index: linux-stage/fs/ext3/super.c
  /*
   * Ext3 always journals updates to the superblock itself, so we don't
   * have to propagate any other updates to the superblock on disk at this
-@@ -2088,6 +2092,10 @@
+@@ -2334,6 +2338,12 @@ int ext3_map_inode_page(struct inode *in
                          unsigned long *blocks, int *created, int create);
  EXPORT_SYMBOL(ext3_map_inode_page);
  
 +EXPORT_SYMBOL(ext3_xattr_get);
 +EXPORT_SYMBOL(ext3_xattr_set_handle);
 +EXPORT_SYMBOL(ext3_bread);
++EXPORT_SYMBOL(ext3_journal_start_sb);
++EXPORT_SYMBOL(__ext3_journal_stop);
 +
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index ee5a81c..9634f4c 100644 (file)
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -68,6 +68,15 @@
 #define FSFILT_DELETE_TRANS_BLOCKS(sb)    EXT3_DELETE_TRANS_BLOCKS(sb)
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+#define fsfilt_ext3_journal_start(inode, nblocks) \
+                                journal_start(EXT3_JOURNAL(inode),nblocks)
+#define fsfilt_ext3_journal_stop(handle)          journal_stop(handle)
+#else
+#define fsfilt_ext3_journal_start(inode, nblocks) ext3_journal_start(inode, nblocks)
+#define fsfilt_ext3_journal_stop(handle)          ext3_journal_stop(handle)
+#endif
+
 static kmem_cache_t *fcb_cache;
 
 struct fsfilt_cb_data {
@@ -256,7 +265,7 @@ static void *fsfilt_ext3_start(struct inode *inode, int op, void *desc_private,
  journal_start:
         LASSERTF(nblocks > 0, "can't start %d credit transaction\n", nblocks);
         lock_24kernel();
-        handle = journal_start(EXT3_JOURNAL(inode), nblocks);
+        handle = fsfilt_ext3_journal_start(inode, nblocks);
         unlock_24kernel();
 
         if (!IS_ERR(handle))
@@ -395,7 +404,7 @@ static void *fsfilt_ext3_brw_start(int objcount, struct fsfilt_objinfo *fso,
 
         LASSERTF(needed > 0, "can't start %d credit transaction\n", needed);
         lock_24kernel();
-        handle = journal_start(journal, needed);
+        handle = fsfilt_ext3_journal_start(fso->fso_dentry->d_inode, needed);
         unlock_24kernel();
         if (IS_ERR(handle)) {
                 CERROR("can't get handle for %d credits: rc = %ld\n", needed,
@@ -437,7 +446,7 @@ static int fsfilt_ext3_commit(struct inode *inode, void *h, int force_sync)
                 handle->h_sync = 1; /* recovery likes this */
 
         lock_24kernel();
-        rc = journal_stop(handle);
+        rc = fsfilt_ext3_journal_stop(handle);
         unlock_24kernel();
 
         return rc;
@@ -463,7 +472,7 @@ static int fsfilt_ext3_commit_async(struct inode *inode, void *h,
         tid = transaction->t_tid;
         /* we don't want to be blocked */
         handle->h_sync = 0;
-        rc = journal_stop(handle);
+        rc = fsfilt_ext3_journal_stop(handle);
         if (rc) {
                 CERROR("error while stopping transaction: %d\n", rc);
                 unlock_24kernel();
@@ -977,7 +986,7 @@ static int ext3_ext_new_extent_cb(struct ext3_extents_tree *tree,
         ext3_up_truncate_sem(inode);
 
         lock_24kernel();
-        handle = journal_start(EXT3_JOURNAL(inode), count+EXT3_ALLOC_NEEDED+1);
+        handle = fsfilt_ext3_journal_start(inode, count+EXT3_ALLOC_NEEDED+1);
         unlock_24kernel();
         if (IS_ERR(handle)) {
                 ext3_down_truncate_sem(inode);
@@ -988,7 +997,7 @@ static int ext3_ext_new_extent_cb(struct ext3_extents_tree *tree,
         if (tgen != EXT_GENERATION(tree)) {
                 /* the tree has changed. so path can be invalid at moment */
                 lock_24kernel();
-                journal_stop(handle);
+                fsfilt_ext3_journal_stop(handle);
                 unlock_24kernel();
                 return EXT_REPEAT;
         }
@@ -1023,7 +1032,7 @@ static int ext3_ext_new_extent_cb(struct ext3_extents_tree *tree,
 
 out:
         lock_24kernel();
-        journal_stop(handle);
+        fsfilt_ext3_journal_stop(handle);
         unlock_24kernel();
 map:
         if (err >= 0) {
@@ -1249,7 +1258,6 @@ static int fsfilt_ext3_write_record(struct file *file, void *buf, int bufsize,
         struct inode *inode = file->f_dentry->d_inode;
         loff_t old_size = inode->i_size, offset = *offs;
         loff_t new_size = inode->i_size;
-        journal_t *journal;
         handle_t *handle;
         int err = 0, block_count = 0, blocksize, size, boffs;
 
@@ -1258,9 +1266,8 @@ static int fsfilt_ext3_write_record(struct file *file, void *buf, int bufsize,
         block_count = (*offs & (blocksize - 1)) + bufsize;
         block_count = (block_count + blocksize - 1) >> inode->i_blkbits;
 
-        journal = EXT3_SB(inode->i_sb)->s_journal;
         lock_24kernel();
-        handle = journal_start(journal,
+        handle = fsfilt_ext3_journal_start(inode,
                                block_count * FSFILT_DATA_TRANS_BLOCKS(inode->i_sb) + 2);
         unlock_24kernel();
         if (IS_ERR(handle)) {
@@ -1322,7 +1329,7 @@ out:
         }
 
         lock_24kernel();
-        journal_stop(handle);
+        fsfilt_ext3_journal_stop(handle);
         unlock_24kernel();
 
         if (err == 0)
Lustre primary development and releases