Branch HEAD

Fix duplicate filesystem feature flag (matches -fc3 kernel).
r=alex

diff --git a/lustre/kernel_patches/patches/vfs-pdirops-2.6.7.patch b/lustre/kernel_patches/patches/vfs-pdirops-2.6.7.patch
index 0621750..2e4e86a 100644 (file)
--- a/lustre/kernel_patches/patches/vfs-pdirops-2.6.7.patch
+++ b/lustre/kernel_patches/patches/vfs-pdirops-2.6.7.patch
@@ -228,7 +228,7 @@ Index: linux-2.6.7/include/linux/fs.h
  #define S_NOQUOTA     64      /* Inode is not counted to quota */
  #define S_DIRSYNC     128     /* Directory modifications are synchronous */
  #define S_NOCMTIME    256     /* Do not update file c/mtime */
-+#define S_PDIROPS     256     /* Parallel directory operations */
++#define S_PDIROPS     512     /* Parallel directory operations */
  
  /*
   * Note that nosuid etc flags are inode-specific: setting some file-system