lustre/kernel_patches/patches/vfs_races-2.6-rhel5.patch

   1 diff -urp linux-2.6.18.rawops/fs/dcache.c linux-2.6.18.races/fs/dcache.c
   2 --- linux-2.6.18.rawops/fs/dcache.c     2007-02-08 19:00:31.000000000 +0200
   3 +++ linux-2.6.18.races/fs/dcache.c      2007-02-14 19:23:49.000000000 +0200
   4 @@ -230,6 +230,13 @@ int d_invalidate(struct dentry * dentry)
   5                 spin_unlock(&dcache_lock);
   6                 return 0;
   7         }
   8 +
   9 +       /* network invalidation by Lustre */
  10 +       if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
  11 +               spin_unlock(&dcache_lock);
  12 +               return 0;
  13 +       }
  14 +
  15         /*
  16          * Check whether to do a partial shrink_dcache
  17          * to get rid of unused child entries.
  18 @@ -1400,13 +1407,21 @@ static void _d_rehash(struct dentry * en
  19   * Adds a dentry to the hash according to its name.
  20   */
  21
  22 -void d_rehash(struct dentry * entry)
  23 +void d_rehash_cond(struct dentry * entry, int lock)
  24  {
  25 -       spin_lock(&dcache_lock);
  26 +       if (lock)
  27 +           spin_lock(&dcache_lock);
  28         spin_lock(&entry->d_lock);
  29         _d_rehash(entry);
  30         spin_unlock(&entry->d_lock);
  31 -       spin_unlock(&dcache_lock);
  32 +       if (lock)
  33 +           spin_unlock(&dcache_lock);
  34 +}
  35 +EXPORT_SYMBOL(d_rehash_cond);
  36 +
  37 +void d_rehash(struct dentry * entry)
  38 +{
  39 +       d_rehash_cond(entry, 1);
  40  }
  41
  42  #define do_switch(x,y) do { \
  43 diff -urp linux-2.6.18.rawops/include/linux/dcache.h linux-2.6.18.races/include/linux/dcache.h
  44 --- linux-2.6.18.rawops/include/linux/dcache.h  2007-02-14 16:52:37.000000000 +0200
  45 +++ linux-2.6.18.races/include/linux/dcache.h   2007-02-14 19:21:14.000000000 +0200
  46 @@ -177,6 +177,7 @@ d_iput:             no              no              no       yes
  47
  48  #define DCACHE_REFERENCED      0x0008  /* Recently used, don't discard. */
  49  #define DCACHE_UNHASHED                0x0010
  50 +#define DCACHE_LUSTRE_INVALID  0x0040  /* Lustre invalidated */
  51
  52  #define DCACHE_INOTIFY_PARENT_WATCHED  0x0020 /* Parent inode is watched */
  53
  54 @@ -254,6 +255,7 @@ extern int have_submounts(struct dentry
  55   * This adds the entry to the hash queues.
  56   */
  57  extern void d_rehash(struct dentry *);
  58 +extern void d_rehash_cond(struct dentry *, int lock);
  59
  60  /**
  61   * d_add - add dentry to hash queues