Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3e69f84)
Branch HEAD
authoradilger <adilger>
Tue, 17 Apr 2007 23:00:56 +0000 (23:00 +0000)
committeradilger <adilger>
Tue, 17 Apr 2007 23:00:56 +0000 (23:00 +0000)
Use EXT4_FEATURE_RO_COMPAT_DIR_NLINK to match upstream e2fsprogs.
b=3244

ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.7.patch patch | blob | history
ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.9.patch patch | blob | history
lustre/kernel_patches/patches/ext3-nlinks-2.4.20-hp_pnnl.patch patch | blob | history
lustre/kernel_patches/patches/ext3-nlinks-2.4.21-chaos.patch patch | blob | history
lustre/kernel_patches/patches/ext3-nlinks-2.4.24.patch patch | blob | history
lustre/kernel_patches/patches/ext3-nlinks-2.6.7.patch patch | blob | history
lustre/kernel_patches/patches/ext3-nlinks-2.6.9.patch patch | blob | history

diff --git a/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.7.patch b/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.7.patch
index a818e62..5054b0c 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.7.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.7.patch
@@ -142,7 +142,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER   0x0001
  #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE     0x0002
  #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR      0x0004
-+#define EXT3_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION     0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE                0x0002
@@ -150,7 +150,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
                                         EXT3_FEATURE_INCOMPAT_EXTENTS)
  #define EXT3_FEATURE_RO_COMPAT_SUPP   (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
-+                                       EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
++                                       EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
                                         EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
diff --git a/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.9.patch b/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.9.patch
index 147928c..d572c8f 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.9.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.9.patch
@@ -144,7 +144,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER   0x0001
  #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE     0x0002
  #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR      0x0004
-+#define EXT3_FEATURE_RO_COMPAT_DIR_NLINK              0x0020
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION     0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE                0x0002
@@ -152,7 +152,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h
                                         EXT3_FEATURE_INCOMPAT_META_BG)
  #define EXT3_FEATURE_RO_COMPAT_SUPP   (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
-+                                       EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
++                                       EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
                                         EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
diff --git a/lustre/kernel_patches/patches/ext3-nlinks-2.4.20-hp_pnnl.patch b/lustre/kernel_patches/patches/ext3-nlinks-2.4.20-hp_pnnl.patch
index 40121ae..56ea50a 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-nlinks-2.4.20-hp_pnnl.patch
+++ b/lustre/kernel_patches/patches/ext3-nlinks-2.4.20-hp_pnnl.patch
@@ -158,7 +158,7 @@ Index: linux/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER   0x0001
  #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE     0x0002
  #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR      0x0004
-+#define EXT3_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION     0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE                0x0002
@@ -166,7 +166,7 @@ Index: linux/include/linux/ext3_fs.h
                                         EXT3_FEATURE_INCOMPAT_EXTENTS)
  #define EXT3_FEATURE_RO_COMPAT_SUPP   (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
-+                                       EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
++                                       EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
                                         EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
diff --git a/lustre/kernel_patches/patches/ext3-nlinks-2.4.21-chaos.patch b/lustre/kernel_patches/patches/ext3-nlinks-2.4.21-chaos.patch
index 5956284..bed994b 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-nlinks-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-nlinks-2.4.21-chaos.patch
@@ -158,7 +158,7 @@ Index: linux-2.4.21/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER   0x0001
  #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE     0x0002
  #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR      0x0004
-+#define EXT3_FEATURE_RO_COMPAT_DIR_NLINK       0x0020
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION     0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE                0x0002
@@ -166,7 +166,7 @@ Index: linux-2.4.21/include/linux/ext3_fs.h
                                         EXT3_FEATURE_INCOMPAT_EXTENTS)
  #define EXT3_FEATURE_RO_COMPAT_SUPP   (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
-+                                       EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
++                                       EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
                                         EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
diff --git a/lustre/kernel_patches/patches/ext3-nlinks-2.4.24.patch b/lustre/kernel_patches/patches/ext3-nlinks-2.4.24.patch
index 0e920f0..0e47e28 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-nlinks-2.4.24.patch
+++ b/lustre/kernel_patches/patches/ext3-nlinks-2.4.24.patch
@@ -158,7 +158,7 @@ Index: linux-2.4.24/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER   0x0001
  #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE     0x0002
  #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR      0x0004
-+#define EXT3_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION     0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE                0x0002
@@ -166,7 +166,7 @@ Index: linux-2.4.24/include/linux/ext3_fs.h
                                         EXT3_FEATURE_INCOMPAT_EXTENTS)
  #define EXT3_FEATURE_RO_COMPAT_SUPP   (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
-+                                       EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
++                                       EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
                                         EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
diff --git a/lustre/kernel_patches/patches/ext3-nlinks-2.6.7.patch b/lustre/kernel_patches/patches/ext3-nlinks-2.6.7.patch
index a818e62..5054b0c 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-nlinks-2.6.7.patch
+++ b/lustre/kernel_patches/patches/ext3-nlinks-2.6.7.patch
@@ -142,7 +142,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER   0x0001
  #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE     0x0002
  #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR      0x0004
-+#define EXT3_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION     0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE                0x0002
@@ -150,7 +150,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
                                         EXT3_FEATURE_INCOMPAT_EXTENTS)
  #define EXT3_FEATURE_RO_COMPAT_SUPP   (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
-+                                       EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
++                                       EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
                                         EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
diff --git a/lustre/kernel_patches/patches/ext3-nlinks-2.6.9.patch b/lustre/kernel_patches/patches/ext3-nlinks-2.6.9.patch
index 147928c..d572c8f 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-nlinks-2.6.9.patch
+++ b/lustre/kernel_patches/patches/ext3-nlinks-2.6.9.patch
@@ -144,7 +144,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER   0x0001
  #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE     0x0002
  #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR      0x0004
-+#define EXT3_FEATURE_RO_COMPAT_DIR_NLINK              0x0020
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
  
  #define EXT3_FEATURE_INCOMPAT_COMPRESSION     0x0001
  #define EXT3_FEATURE_INCOMPAT_FILETYPE                0x0002
@@ -152,7 +152,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h
                                         EXT3_FEATURE_INCOMPAT_META_BG)
  #define EXT3_FEATURE_RO_COMPAT_SUPP   (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
-+                                       EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \
++                                       EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
                                         EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
  
  /*
Lustre primary development and releases