Skip to content
Snippets Groups Projects
Commit ed8bd873 authored by Andreas Dilger's avatar Andreas Dilger
Browse files

Branch HEAD 

Use EXT4_FEATURE_RO_COMPAT_DIR_NLINK to match upstream e2fsprogs.
b=3244
parent 3e69f841
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 14 deletions
ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.7.patch
+ 2
− 2
View file @ ed8bd873
...@@ -142,7 +142,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h ...@@ -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_SPARSE_SUPER 0x0001
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 #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_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
...@@ -150,7 +150,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h ...@@ -150,7 +150,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
EXT3_FEATURE_INCOMPAT_EXTENTS) EXT3_FEATURE_INCOMPAT_EXTENTS)
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR) EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/* /*
ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.9.patch
+ 2
− 2
View file @ ed8bd873
...@@ -144,7 +144,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h ...@@ -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_SPARSE_SUPER 0x0001
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 #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_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
...@@ -152,7 +152,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h ...@@ -152,7 +152,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h
EXT3_FEATURE_INCOMPAT_META_BG) EXT3_FEATURE_INCOMPAT_META_BG)
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR) EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/* /*
lustre/kernel_patches/patches/ext3-nlinks-2.4.20-hp_pnnl.patch
+ 2
− 2
View file @ ed8bd873
...@@ -158,7 +158,7 @@ Index: linux/include/linux/ext3_fs.h ...@@ -158,7 +158,7 @@ Index: linux/include/linux/ext3_fs.h
#define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 #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_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
...@@ -166,7 +166,7 @@ Index: linux/include/linux/ext3_fs.h ...@@ -166,7 +166,7 @@ Index: linux/include/linux/ext3_fs.h
EXT3_FEATURE_INCOMPAT_EXTENTS) EXT3_FEATURE_INCOMPAT_EXTENTS)
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR) EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/* /*
lustre/kernel_patches/patches/ext3-nlinks-2.4.21-chaos.patch
+ 2
− 2
View file @ ed8bd873
...@@ -158,7 +158,7 @@ Index: linux-2.4.21/include/linux/ext3_fs.h ...@@ -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_SPARSE_SUPER 0x0001
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 #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_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
...@@ -166,7 +166,7 @@ Index: linux-2.4.21/include/linux/ext3_fs.h ...@@ -166,7 +166,7 @@ Index: linux-2.4.21/include/linux/ext3_fs.h
EXT3_FEATURE_INCOMPAT_EXTENTS) EXT3_FEATURE_INCOMPAT_EXTENTS)
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR) EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/* /*
lustre/kernel_patches/patches/ext3-nlinks-2.4.24.patch
+ 2
− 2
View file @ ed8bd873
...@@ -158,7 +158,7 @@ Index: linux-2.4.24/include/linux/ext3_fs.h ...@@ -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_SPARSE_SUPER 0x0001
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 #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_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
...@@ -166,7 +166,7 @@ Index: linux-2.4.24/include/linux/ext3_fs.h ...@@ -166,7 +166,7 @@ Index: linux-2.4.24/include/linux/ext3_fs.h
EXT3_FEATURE_INCOMPAT_EXTENTS) EXT3_FEATURE_INCOMPAT_EXTENTS)
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR) EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/* /*
lustre/kernel_patches/patches/ext3-nlinks-2.6.7.patch
+ 2
− 2
View file @ ed8bd873
...@@ -142,7 +142,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h ...@@ -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_SPARSE_SUPER 0x0001
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 #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_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
...@@ -150,7 +150,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h ...@@ -150,7 +150,7 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
EXT3_FEATURE_INCOMPAT_EXTENTS) EXT3_FEATURE_INCOMPAT_EXTENTS)
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR) EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/* /*
lustre/kernel_patches/patches/ext3-nlinks-2.6.9.patch
+ 2
− 2
View file @ ed8bd873
...@@ -144,7 +144,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h ...@@ -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_SPARSE_SUPER 0x0001
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 #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_COMPRESSION 0x0001
#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
...@@ -152,7 +152,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h ...@@ -152,7 +152,7 @@ Index: linux-2.6.12/include/linux/ext3_fs.h
EXT3_FEATURE_INCOMPAT_META_BG) EXT3_FEATURE_INCOMPAT_META_BG)
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR) EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
/* /*
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy