[Pkg-lustre-svn-commit] updated: [4fefb25] Updated -3 patch of the LBUG series as it doesn't apply

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 4fefb257d2e0abc29f7753f3cf7884f90bc41c6d
Author: Patrick Winnertz <winnie at debian.org>
Date:   Thu Apr 29 12:37:22 2010 +0200

    Updated -3 patch of the LBUG series as it doesn't apply
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/LBUG_open-unlinked_bug_22177-3.dpatch b/debian/patches/LBUG_open-unlinked_bug_22177-3.dpatch
index c783a28..ba5a7df 100755
--- a/debian/patches/LBUG_open-unlinked_bug_22177-3.dpatch
+++ b/debian/patches/LBUG_open-unlinked_bug_22177-3.dpatch
@@ -5,45 +5,3 @@
 ## DP: Patch from bugzilla #22177, should be fixed in 1.8.3
 
 @DPATCH@
-diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
-index 97dc613..4de6d2d 100644
---- a/lustre/mds/mds_reint.c
-+++ b/lustre/mds/mds_reint.c
-@@ -1755,8 +1755,9 @@ static int mds_orphan_add_link(struct mds_update_record *rec,
-          * for linking and return real mode back then -bzzz */
-         mode = inode->i_mode;
-         inode->i_mode = S_IFREG;
--        /* avoid vfs_link upon 0 nlink inode */
--        ++inode->i_nlink;
-+        /* avoid vfs_link upon 0 nlink inode, inc by 2 instead of 1 because
-+         * ext3_inc_count() can reset i_nlink for indexed directory */
-+        inode->i_nlink += 2;
-         rc = ll_vfs_link(dentry, mds->mds_vfsmnt, pending_dir, pending_child,
-                          mds->mds_vfsmnt);
-         if (rc)
-@@ -1767,19 +1768,21 @@ static int mds_orphan_add_link(struct mds_update_record *rec,
- 
-         /* return mode and correct i_nlink if inode is directory */
-         inode->i_mode = mode;
--        LASSERTF(inode->i_nlink == 2, "%s nlink == %d\n",
-+        LASSERTF(inode->i_nlink == 3, "%s nlink == %d\n",
-                  S_ISDIR(mode) ? "dir" : S_ISREG(mode) ? "file" : "other",
-                  inode->i_nlink);
-         if (S_ISDIR(mode)) {
-                 pending_dir->i_nlink++;
-                 if (pending_dir->i_sb->s_op->dirty_inode)
-                         pending_dir->i_sb->s_op->dirty_inode(pending_dir);
-+                inode->i_nlink -= 1;
-         } else {
--                --inode->i_nlink;
--                if (inode->i_sb->s_op->dirty_inode)
--                        inode->i_sb->s_op->dirty_inode(inode);
-+                inode->i_nlink -= 2;
-         }
- 
-+        if (inode->i_sb->s_op->dirty_inode)
-+                inode->i_sb->s_op->dirty_inode(inode);
-+
-         GOTO(out_dput, rc = 1);
- out_dput:
-         l_dput(pending_child);

-- 
Lustre Debian Packaging