lustre/kernel_patches/patches/vfs_races-2.6.22-vanilla.patch

   1 Index: linux-2.6/fs/dcache.c
   2 ===================================================================
   3 --- linux-2.6.orig/fs/dcache.c  2006-08-31 11:59:09.000000000 +0800
   4 +++ linux-2.6/fs/dcache.c       2006-09-06 14:01:37.000000000 +0800
   5 @@ -226,6 +226,13 @@ int d_invalidate(struct dentry * dentry)
   6                 spin_unlock(&dcache_lock);
   7                 return 0;
   8         }
   9 +
  10 +       /* network invalidation by Lustre */
  11 +       if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
  12 +               spin_unlock(&dcache_lock);
  13 +               return 0;
  14 +       }
  15 +
  16         /*
  17          * Check whether to do a partial shrink_dcache
  18          * to get rid of unused child entries.
  19 @@ -1242,15 +1249,24 @@ static void __d_rehash(struct dentry * e
  20   * Adds a dentry to the hash according to its name.
  21   */
  22
  23 -void d_rehash(struct dentry * entry)
  24 +void d_rehash_cond(struct dentry * entry, int lock)
  25  {
  26 -       spin_lock(&dcache_lock);
  27 +       if (lock)
  28 +               spin_lock(&dcache_lock);
  29         spin_lock(&entry->d_lock);
  30         _d_rehash(entry);
  31         spin_unlock(&entry->d_lock);
  32 -       spin_unlock(&dcache_lock);
  33 +       if (lock)
  34 +               spin_unlock(&dcache_lock);
  35  }
  36
  37 +EXPORT_SYMBOL(d_rehash_cond);
  38 +
  39 +void d_rehash(struct dentry * entry)
  40 +{
  41 +       d_rehash_cond(entry, 1);
  42 +}
  43 +
  44  #define do_switch(x,y) do { \
  45         __typeof__ (x) __tmp = x; \
  46         x = y; y = __tmp; } while (0)
  47 Index: linux-2.6/include/linux/dcache.h
  48 ===================================================================
  49 --- linux-2.6.orig/include/linux/dcache.h       2006-08-31 12:00:23.000000000 +0800
  50 +++ linux-2.6/include/linux/dcache.h    2006-09-06 14:02:36.000000000 +0800
  51 @@ -176,6 +176,7 @@ d_iput:             no              no              no       yes
  52
  53  #define DCACHE_REFERENCED      0x0008  /* Recently used, don't discard. */
  54  #define DCACHE_UNHASHED                0x0010
  55 +#define DCACHE_LUSTRE_INVALID  0x0040  /* Lustre invalidated */
  56
  57  #define DCACHE_INOTIFY_PARENT_WATCHED  0x0020 /* Parent inode is watched */
  58