b=20298 (Merge head ldiskfs and b1_8 ldiskfs)

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-nlinks-2.6.9.patch

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..50ff2e1 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.9.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.9.patch
@@ -30,12 +30,12 @@ Index: linux-2.6.12/fs/ext3/namei.c
                return -EMLINK;
  
  retry:
-@@ -1726,7 +1732,7 @@ retry:
+@@ -1782,7 +1793,7 @@ retry:
        inode->i_size = EXT3_I(inode)->i_disksize = inode->i_sb->s_blocksize;
        dir_block = ext3_bread (handle, inode, 0, 1, &err);
        if (!dir_block) {
 -              inode->i_nlink--; /* is this nlink == 0? */
-+              ext3_dec_count(handle, inode); /* is this nlink == 0? */
++              drop_nlink(inode); /* is this nlink == 0? */
                ext3_mark_inode_dirty(handle, inode);
                iput (inode);
                goto out_stop;
@@ -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)
  
  /*