lustre/kernel_patches/patches/ext3-orphan_lock-suse.patch

   1 Index: linux-2.4.21-suse/fs/ext3/namei.c
   2 ===================================================================
   3 --- linux-2.4.21-suse.orig/fs/ext3/namei.c      2003-10-30 02:17:22.000000000 +0300
   4 +++ linux-2.4.21-suse/fs/ext3/namei.c   2003-10-30 02:20:53.000000000 +0300
   5 @@ -1747,8 +1747,8 @@
   6         struct super_block *sb = inode->i_sb;
   7         struct ext3_iloc iloc;
   8         int err = 0, rc;
   9 -
  10 -       lock_super(sb);
  11 +
  12 +       down(&EXT3_SB(sb)->s_orphan_lock);
  13         if (!list_empty(&EXT3_I(inode)->i_orphan))
  14                 goto out_unlock;
  15
  16 @@ -1796,7 +1796,7 @@
  17         jbd_debug(4, "orphan inode %ld will point to %d\n",
  18                         inode->i_ino, NEXT_ORPHAN(inode));
  19  out_unlock:
  20 -       unlock_super(sb);
  21 +       up(&EXT3_SB(sb)->s_orphan_lock);
  22         ext3_std_error(inode->i_sb, err);
  23         return err;
  24  }
  25 @@ -1808,20 +1808,19 @@
  26  int ext3_orphan_del(handle_t *handle, struct inode *inode)
  27  {
  28         struct list_head *prev;
  29 -       struct ext3_sb_info *sbi;
  30 +       struct ext3_sb_info *sbi = EXT3_SB(inode->i_sb);
  31         unsigned long ino_next;
  32         struct ext3_iloc iloc;
  33         int err = 0;
  34
  35 -       lock_super(inode->i_sb);
  36 +       down(&sbi->s_orphan_lock);
  37         if (list_empty(&inode->u.ext3_i.i_orphan)) {
  38 -               unlock_super(inode->i_sb);
  39 +               up(&sbi->s_orphan_lock);
  40                 return 0;
  41         }
  42
  43         ino_next = NEXT_ORPHAN(inode);
  44         prev = inode->u.ext3_i.i_orphan.prev;
  45 -       sbi = EXT3_SB(inode->i_sb);
  46
  47         jbd_debug(4, "remove inode %lu from orphan list\n", inode->i_ino);
  48
  49 @@ -1870,7 +1869,7 @@
  50  out_err:
  51         ext3_std_error(inode->i_sb, err);
  52  out:
  53 -       unlock_super(inode->i_sb);
  54 +       up(&sbi->s_orphan_lock);
  55         return err;
  56
  57  out_brelse:
  58 Index: linux-2.4.21-suse/fs/ext3/super.c
  59 ===================================================================
  60 --- linux-2.4.21-suse.orig/fs/ext3/super.c      2003-10-30 02:17:22.000000000 +0300
  61 +++ linux-2.4.21-suse/fs/ext3/super.c   2003-10-30 02:17:22.000000000 +0300
  62 @@ -1151,6 +1151,7 @@
  63          */
  64         sb->s_op = &ext3_sops;
  65         INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
  66 +       sema_init(&sbi->s_orphan_lock, 1);
  67
  68         sb->s_root = 0;
  69
  70 Index: linux-2.4.21-suse/include/linux/ext3_fs_sb.h
  71 ===================================================================
  72 --- linux-2.4.21-suse.orig/include/linux/ext3_fs_sb.h   2003-10-30 02:17:22.000000000 +0300
  73 +++ linux-2.4.21-suse/include/linux/ext3_fs_sb.h        2003-10-30 02:17:22.000000000 +0300
  74 @@ -69,6 +69,7 @@
  75         struct inode * s_journal_inode;
  76         struct journal_s * s_journal;
  77         struct list_head s_orphan;
  78 +       struct semaphore s_orphan_lock;
  79         unsigned long s_commit_interval;
  80         struct block_device *journal_bdev;
  81  #ifdef CONFIG_JBD_DEBUG