b=14596

 i=adilger, johann

 correction for deadlock in ext3_expand_extra_isize

diff --git a/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6-sles10.patch
index 2514498..d29c136 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6-sles10.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.16.54-0.2.3/fs/ext3/inode.c
+Index: linux-2.6.16-sles10/fs/ext3/inode.c
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/inode.c
-+++ linux-2.6.16.54-0.2.3/fs/ext3/inode.c
+--- linux-2.6.16-sles10.orig/fs/ext3/inode.c
++++ linux-2.6.16-sles10/fs/ext3/inode.c
 @@ -2561,6 +2561,13 @@ void ext3_read_inode(struct inode * inod
        EXT3_INODE_GET_XTIME(i_atime, inode, raw_inode);
        EXT3_EINODE_GET_XTIME(i_crtime, ei, raw_inode);
@@ -66,10 +66,10 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/inode.c
        if (!err)
                err = ext3_mark_iloc_dirty(handle, inode, &iloc);
        return err;
-Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs.h
+Index: linux-2.6.16-sles10/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/include/linux/ext3_fs.h
-+++ linux-2.6.16.54-0.2.3/include/linux/ext3_fs.h
+--- linux-2.6.16-sles10.orig/include/linux/ext3_fs.h
++++ linux-2.6.16-sles10/include/linux/ext3_fs.h
 @@ -227,6 +227,7 @@ struct ext3_group_desc
  #define EXT3_STATE_JDATA              0x00000001 /* journaled data exists */
  #define EXT3_STATE_NEW                        0x00000002 /* inode is newly created */
@@ -104,10 +104,10 @@ Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs.h
  #if defined(__KERNEL__) || defined(__linux__)
  #define i_reserved1   osd1.linux1.l_i_reserved1
  #define i_frag                osd2.linux2.l_i_frag
-Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs_i.h
+Index: linux-2.6.16-sles10/include/linux/ext3_fs_i.h
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/include/linux/ext3_fs_i.h
-+++ linux-2.6.16.54-0.2.3/include/linux/ext3_fs_i.h
+--- linux-2.6.16-sles10.orig/include/linux/ext3_fs_i.h
++++ linux-2.6.16-sles10/include/linux/ext3_fs_i.h
 @@ -20,6 +20,8 @@
  #include <linux/rbtree.h>
  #include <linux/seqlock.h>
@@ -126,10 +126,10 @@ Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs_i.h
  };
  
  #endif        /* _LINUX_EXT3_FS_I */
-Index: linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
+Index: linux-2.6.16-sles10/fs/ext3/xattr.c
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/xattr.c
-+++ linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
+--- linux-2.6.16-sles10.orig/fs/ext3/xattr.c
++++ linux-2.6.16-sles10/fs/ext3/xattr.c
 @@ -505,6 +505,20 @@ ext3_xattr_release_block(handle_t *handl
        }
  }
@@ -170,16 +170,18 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
        error = ext3_get_inode_loc(inode, &is.iloc);
        if (error)
                goto cleanup;
-@@ -1008,6 +1027,8 @@ ext3_xattr_set_handle(handle_t *handle, 
+@@ -1007,7 +1026,10 @@ ext3_xattr_set_handle(handle_t *handle, 
+       if (!error) {
                ext3_xattr_update_super_block(handle, inode->i_sb);
                inode->i_ctime = ext3_current_time(inode);
++
                error = ext3_mark_iloc_dirty(handle, inode, &is.iloc);
 +              if (!value)
 +                      EXT3_I(inode)->i_state &= ~EXT3_STATE_NO_EXPAND;
                /*
                 * The bh is consumed by ext3_mark_iloc_dirty, even with
                 * error != 0.
-@@ -1020,6 +1041,8 @@ ext3_xattr_set_handle(handle_t *handle, 
+@@ -1020,6 +1042,8 @@ ext3_xattr_set_handle(handle_t *handle, 
  cleanup:
        brelse(is.iloc.bh);
        brelse(bs.bh);
@@ -188,7 +190,7 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
        up_write(&EXT3_I(inode)->xattr_sem);
        return error;
  }
-@@ -1059,6 +1082,249 @@ retry:
+@@ -1059,6 +1083,249 @@ retry:
        return error;
  }
  
@@ -438,10 +440,10 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
  /*
   * ext3_xattr_delete_inode()
   *
-Index: linux-2.6.16.54-0.2.3/fs/ext3/xattr.h
+Index: linux-2.6.16-sles10/fs/ext3/xattr.h
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/xattr.h
-+++ linux-2.6.16.54-0.2.3/fs/ext3/xattr.h
+--- linux-2.6.16-sles10.orig/fs/ext3/xattr.h
++++ linux-2.6.16-sles10/fs/ext3/xattr.h
 @@ -75,6 +75,9 @@ extern int ext3_xattr_set_handle(handle_
  extern void ext3_xattr_delete_inode(handle_t *, struct inode *);
  extern void ext3_xattr_put_super(struct super_block *);

diff --git a/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch
index 249a1e0..26f71ac 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch
@@ -2,7 +2,7 @@ Index: linux-2.6.18/fs/ext3/inode.c
 ===================================================================
 --- linux-2.6.18.orig/fs/ext3/inode.c
 +++ linux-2.6.18/fs/ext3/inode.c
-@@ -2690,6 +2690,13 @@ void ext3_read_inode(struct inode * inod
+@@ -2703,6 +2703,13 @@ void ext3_read_inode(struct inode * inod
        EXT3_INODE_GET_XTIME(i_atime, inode, raw_inode);
        EXT3_EINODE_GET_XTIME(i_crtime, ei, raw_inode);
  
@@ -16,7 +16,7 @@ Index: linux-2.6.18/fs/ext3/inode.c
        if (S_ISREG(inode->i_mode)) {
                inode->i_op = &ext3_file_inode_operations;
                inode->i_fop = &ext3_file_operations;
-@@ -2828,8 +2835,14 @@ static int ext3_do_update_inode(handle_t
+@@ -2841,8 +2848,14 @@ static int ext3_do_update_inode(handle_t
        } else for (block = 0; block < EXT3_N_BLOCKS; block++)
                raw_inode->i_block[block] = ei->i_data[block];
  
@@ -32,7 +32,7 @@ Index: linux-2.6.18/fs/ext3/inode.c
  
        BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
        rc = ext3_journal_dirty_metadata(handle, bh);
-@@ -3103,10 +3116,32 @@ ext3_reserve_inode_write(handle_t *handl
+@@ -3116,10 +3129,32 @@ ext3_reserve_inode_write(handle_t *handl
  int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode)
  {
        struct ext3_iloc iloc;
@@ -70,7 +70,7 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
 ===================================================================
 --- linux-2.6.18.orig/include/linux/ext3_fs.h
 +++ linux-2.6.18/include/linux/ext3_fs.h
-@@ -224,6 +224,7 @@ struct ext3_group_desc
+@@ -201,6 +201,7 @@ struct ext3_group_desc
  #define EXT3_STATE_JDATA              0x00000001 /* journaled data exists */
  #define EXT3_STATE_NEW                        0x00000002 /* inode is newly created */
  #define EXT3_STATE_XATTR              0x00000004 /* has in-inode xattrs */
@@ -78,7 +78,7 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
  
  /* Used to pass group descriptor data when online resize is done */
  struct ext3_new_group_input {
-@@ -297,7 +298,7 @@ struct ext3_inode {
+@@ -277,7 +278,7 @@ struct ext3_inode {
        __le32  i_flags;        /* File flags */
        union {
                struct {
@@ -87,7 +87,7 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
                } linux1;
                struct {
                        __u32  h_i_translator;
-@@ -342,6 +343,7 @@ struct ext3_inode {
+@@ -322,6 +323,7 @@ struct ext3_inode {
        __le32  i_atime_extra;  /* extra Access time      (nsec << 2 | epoch) */
        __le32  i_crtime;       /* File Creation time */
        __le32  i_crtime_extra; /* extra File Creation time (nsec << 2 | epoch) */
@@ -95,7 +95,7 @@ Index: linux-2.6.18/include/linux/ext3_fs.h
  };
  
  #define i_size_high   i_dir_acl
-@@ -404,6 +406,8 @@ do {                                                                              \
+@@ -384,6 +386,8 @@ do {                                                                              \
                                       raw_inode->xtime ## _extra);            \
  } while (0)
  
@@ -117,8 +117,8 @@ Index: linux-2.6.18/include/linux/ext3_fs_i.h
  /* data type for block offset of block group */
  typedef int ext3_grpblk_t;
  
-@@ -162,6 +164,8 @@ struct ext3_inode_info {
-       spinlock_t i_prealloc_lock;
+@@ -147,6 +149,8 @@ struct ext3_inode_info {
+       struct timespec i_crtime;
  
        void *i_filterdata;
 +
@@ -151,44 +151,16 @@ Index: linux-2.6.18/fs/ext3/xattr.c
  struct ext3_xattr_info {
        int name_index;
        const char *name;
-@@ -945,13 +959,18 @@ ext3_xattr_set_handle(handle_t *handle, 
-       struct ext3_xattr_block_find bs = {
-               .s = { .not_found = -ENODATA, },
-       };
-+      unsigned long no_expand;
-       int error;
- 
-       if (!name)
-               return -EINVAL;
-       if (strlen(name) > 255)
-               return -ERANGE;
-+
-       down_write(&EXT3_I(inode)->xattr_sem);
-+      no_expand = EXT3_I(inode)->i_state & EXT3_STATE_NO_EXPAND;
-+      EXT3_I(inode)->i_state |= EXT3_STATE_NO_EXPAND;
-+
-       error = ext3_get_inode_loc(inode, &is.iloc);
-       if (error)
-               goto cleanup;
-@@ -1009,6 +1028,8 @@ ext3_xattr_set_handle(handle_t *handle, 
+@@ -1008,6 +1022,8 @@ ext3_xattr_set_handle(handle_t *handle, 
+       if (!error) {
                ext3_xattr_update_super_block(handle, inode->i_sb);
                inode->i_ctime = ext3_current_time(inode);
-               error = ext3_mark_iloc_dirty(handle, inode, &is.iloc);
 +              if (!value)
 +                      EXT3_I(inode)->i_state &= ~EXT3_STATE_NO_EXPAND;
+               error = ext3_mark_iloc_dirty(handle, inode, &is.iloc);
                /*
                 * The bh is consumed by ext3_mark_iloc_dirty, even with
-                * error != 0.
-@@ -1021,6 +1042,8 @@ ext3_xattr_set_handle(handle_t *handle, 
- cleanup:
-       brelse(is.iloc.bh);
-       brelse(bs.bh);
-+      if (no_expand == 0)
-+              EXT3_I(inode)->i_state &= ~EXT3_STATE_NO_EXPAND;
-       up_write(&EXT3_I(inode)->xattr_sem);
-       return error;
- }
-@@ -1060,6 +1083,249 @@ retry:
+@@ -1060,6 +1076,249 @@ retry:
        return error;
  }
  

diff --git a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
index 0417b60..86fce30 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.16.54-0.2.3/fs/ext3/ialloc.c
+Index: linux-2.6.16-sles10/fs/ext3/ialloc.c
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/ialloc.c
-+++ linux-2.6.16.54-0.2.3/fs/ext3/ialloc.c
+--- linux-2.6.16-sles10.orig/fs/ext3/ialloc.c
++++ linux-2.6.16-sles10/fs/ext3/ialloc.c
 @@ -727,7 +727,8 @@ got:
        /* This is the optimal IO size (for stat), not the fs block size */
        inode->i_blksize = PAGE_SIZE;
@@ -24,10 +24,10 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/ialloc.c
  
        ret = inode;
        if(DQUOT_ALLOC_INODE(inode)) {
-Index: linux-2.6.16.54-0.2.3/fs/ext3/inode.c
+Index: linux-2.6.16-sles10/fs/ext3/inode.c
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/inode.c
-+++ linux-2.6.16.54-0.2.3/fs/ext3/inode.c
+--- linux-2.6.16-sles10.orig/fs/ext3/inode.c
++++ linux-2.6.16-sles10/fs/ext3/inode.c
 @@ -621,7 +621,7 @@ static int ext3_splice_branch(handle_t *
  
        /* We are done with atomic stuff, now do the rest of housekeeping */
@@ -85,10 +85,10 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/inode.c
        raw_inode->i_blocks = cpu_to_le32(inode->i_blocks);
        raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
        raw_inode->i_flags = cpu_to_le32(ei->i_flags);
-Index: linux-2.6.16.54-0.2.3/fs/ext3/ioctl.c
+Index: linux-2.6.16-sles10/fs/ext3/ioctl.c
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/ioctl.c
-+++ linux-2.6.16.54-0.2.3/fs/ext3/ioctl.c
+--- linux-2.6.16-sles10.orig/fs/ext3/ioctl.c
++++ linux-2.6.16-sles10/fs/ext3/ioctl.c
 @@ -114,7 +114,7 @@ int ext3_ioctl (struct inode * inode, st
                ei->i_flags = flags;
  
@@ -107,10 +107,10 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/ioctl.c
                        inode->i_generation = generation;
                        err = ext3_mark_iloc_dirty(handle, inode, &iloc);
                }
-Index: linux-2.6.16.54-0.2.3/fs/ext3/namei.c
+Index: linux-2.6.16-sles10/fs/ext3/namei.c
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/namei.c
-+++ linux-2.6.16.54-0.2.3/fs/ext3/namei.c
+--- linux-2.6.16-sles10.orig/fs/ext3/namei.c
++++ linux-2.6.16-sles10/fs/ext3/namei.c
 @@ -1296,7 +1296,7 @@ static int add_dirent_to_buf(handle_t *h
         * happen is that the times are slightly out of date
         * and/or different from the directory change time.
@@ -175,10 +175,10 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/namei.c
        ext3_update_dx_flag(old_dir);
        if (dir_bh) {
                BUFFER_TRACE(dir_bh, "get_write_access");
-Index: linux-2.6.16.54-0.2.3/fs/ext3/super.c
+Index: linux-2.6.16-sles10/fs/ext3/super.c
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/super.c
-+++ linux-2.6.16.54-0.2.3/fs/ext3/super.c
+--- linux-2.6.16-sles10.orig/fs/ext3/super.c
++++ linux-2.6.16-sles10/fs/ext3/super.c
 @@ -1709,6 +1709,8 @@ static int ext3_fill_super (struct super
                                sbi->s_inode_size);
                        goto failed_mount;
@@ -221,10 +221,10 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/super.c
        /*
         * akpm: core read_super() calls in here with the superblock locked.
         * That deadlocks, because orphan cleanup needs to lock the superblock
-Index: linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
+Index: linux-2.6.16-sles10/fs/ext3/xattr.c
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/fs/ext3/xattr.c
-+++ linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
+--- linux-2.6.16-sles10.orig/fs/ext3/xattr.c
++++ linux-2.6.16-sles10/fs/ext3/xattr.c
 @@ -1006,7 +1006,7 @@ ext3_xattr_set_handle(handle_t *handle, 
        }
        if (!error) {
@@ -234,10 +234,10 @@ Index: linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
                error = ext3_mark_iloc_dirty(handle, inode, &is.iloc);
                /*
                 * The bh is consumed by ext3_mark_iloc_dirty, even with
-Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs.h
+Index: linux-2.6.16-sles10/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/include/linux/ext3_fs.h
-+++ linux-2.6.16.54-0.2.3/include/linux/ext3_fs.h
+--- linux-2.6.16-sles10.orig/include/linux/ext3_fs.h
++++ linux-2.6.16-sles10/include/linux/ext3_fs.h
 @@ -294,7 +294,7 @@ struct ext3_inode {
        __le16  i_uid;          /* Low 16 bits of Owner Uid */
        __le32  i_size;         /* Size in bytes */
@@ -375,10 +375,10 @@ Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs.h
  /*
   * This structure is stuffed into the struct file's private_data field
   * for directories.  It is where we put information so that we can do
-Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs_i.h
+Index: linux-2.6.16-sles10/include/linux/ext3_fs_i.h
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/include/linux/ext3_fs_i.h
-+++ linux-2.6.16.54-0.2.3/include/linux/ext3_fs_i.h
+--- linux-2.6.16-sles10.orig/include/linux/ext3_fs_i.h
++++ linux-2.6.16-sles10/include/linux/ext3_fs_i.h
 @@ -120,6 +120,7 @@ struct ext3_inode_info {
  
        /* on-disk additional length */
@@ -387,10 +387,10 @@ Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs_i.h
  
        /*
         * truncate_sem is for serialising ext3_truncate() against
-Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs_sb.h
+Index: linux-2.6.16-sles10/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.6.16.54-0.2.3.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.16.54-0.2.3/include/linux/ext3_fs_sb.h
+--- linux-2.6.16-sles10.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.16-sles10/include/linux/ext3_fs_sb.h
 @@ -68,6 +68,8 @@ struct ext3_sb_info {
        /* Last group used to allocate inode */
        int s_last_alloc_group;