The following commit has been merged in the master branch:
commit 0542c74e446ee09e0b1b15e583374b7a367b5ab7
Author: Patrick Winnertz <win...@debian.org>
Date:   Fri Dec 10 10:58:59 2010 +0100

    cleaned up debian/patches/ - removed unused stuff
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/LBUG_open-unlinked_bug_22177-1.patch 
b/debian/patches/LBUG_open-unlinked_bug_22177-1.patch
deleted file mode 100755
index e7ba891..0000000
--- a/debian/patches/LBUG_open-unlinked_bug_22177-1.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-## LBUG_open-unlinked_bug_22177-1.dpatch by Patrick Winnertz 
<win...@debian.org>
-## DP: Patch from bugzilla #22177
-
-diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
-index 97dc613..3c53148 100644
---- a/lustre/mds/mds_reint.c
-+++ b/lustre/mds/mds_reint.c
-@@ -1755,31 +1755,37 @@ 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)
--                CERROR("error linking orphan %s to PENDING: rc = %d\n",
-+                CERROR("error linking orphan %s %s to PENDING: rc = %d\n",
-+                       S_ISDIR(mode) ? "dir" : S_ISREG(mode) ? "file" : 
"other",
-                        rec->ur_name, rc);
-         else
-                 mds_inode_set_orphan(inode);
- 
-         /* return mode and correct i_nlink if inode is directory */
-         inode->i_mode = mode;
--        LASSERTF(inode->i_nlink == 2, "%s nlink == %d\n",
-+        LASSERTF(rc || 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);
--        } 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);
-+
-+        if (rc)
-+                GOTO(out_dput, rc);
-+
-         GOTO(out_dput, rc = 1);
- out_dput:
-         l_dput(pending_child);
-@@ -2048,11 +2054,18 @@ static int mds_reint_unlink(struct mds_update_record 
*rec, int offset,
-         }
- 
-         if (rc == 0 && child_inode->i_nlink == 0) {
--                if (mds_orphan_needed(obd, child_inode))
-+                if (mds_orphan_needed(obd, child_inode)) {
-                         rc = mds_orphan_add_link(rec, obd, dchild);
--
--                if (rc == 1)
--                        GOTO(cleanup, rc = 0);
-+                        if (rc == 1)
-+                                /* child inode was successfully linked
-+                                 * to PENDING */
-+                                GOTO(cleanup, rc = 0);
-+                        else
-+                                /* we failed to move the file to PENDING,
-+                                 * really unlink the file as if there were
-+                                 * no more openers */
-+                                rc = 0;
-+                }
- 
-                 if (!S_ISREG(child_inode->i_mode))
-                         GOTO(cleanup, rc);
-@@ -2738,11 +2751,18 @@ no_unlink:
-         }
- 
-         if (rc == 0 && new_inode != NULL && new_inode->i_nlink == 0) {
--                if (mds_orphan_needed(obd, new_inode))
-+                if (mds_orphan_needed(obd, new_inode)) {
-                         rc = mds_orphan_add_link(rec, obd, de_new);
- 
--                if (rc == 1)
--                        GOTO(cleanup, rc = 0);
-+                        if (rc == 1)
-+                                /* inode successfully linked to PENDING */
-+                                GOTO(cleanup, rc = 0);
-+                        else
-+                                /* we failed to move the file to PENDING,
-+                                 * really unlink the file as if there were
-+                                 * no more openers */
-+                                rc = 0;
-+                }
- 
-                 if (!S_ISREG(new_inode->i_mode))
-                         GOTO(cleanup, rc);
-diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
-index 4241a6b..7cefe84 100644
---- a/lustre/tests/sanity.sh
-+++ b/lustre/tests/sanity.sh
-@@ -6458,6 +6458,25 @@ test_202() {
- }
- run_test 202 "O_APPEND+O_DIRECT multistripe write ========================"
- 
-+test_203() { # bug 22177
-+        mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
-+        # create enough files to index the directory
-+        createmany -o $DIR/$tdir/foobar 4000
-+        # print attributes for debug purpose
-+        lsattr -d .
-+        # open dir
-+        multiop_bg_pause $DIR/$tdir D_Sc || return 1
-+        MULTIPID=$!
-+        # remove the files & current working dir
-+        unlinkmany $DIR/$tdir/foobar 4000
-+        rmdir $DIR/$tdir
-+        kill -USR1 $MULTIPID
-+        wait $MULTIPID
-+        stat $DIR/$tdir && error "open-unlinked dir was not removed!"
-+        return 0
-+}
-+run_test 203 "Test open-unlinked dir ========================"
-+
- #
- # tests that do cleanup/setup should be run at the end
- #
diff --git a/debian/patches/LBUG_open-unlinked_bug_22177-2.patch 
b/debian/patches/LBUG_open-unlinked_bug_22177-2.patch
deleted file mode 100755
index c459554..0000000
--- a/debian/patches/LBUG_open-unlinked_bug_22177-2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-## LBUG_open-unlinked_bug_22177.dpatch by Patrick Winnertz <win...@debian.org>
-## DP: Patch from Bugzilla #22177, should be fixed in 1.8.3
-
-diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c
-index 4feb1d8..31e1768 100644
---- a/lustre/mds/mds_open.c
-+++ b/lustre/mds/mds_open.c
-@@ -1496,7 +1496,7 @@ int mds_mfd_close(struct ptlrpc_request *req, int offset,
-                 CDEBUG(D_INODE, "destroying orphan object %s\n", fidname);
- 
-                 if ((S_ISREG(inode->i_mode) && inode->i_nlink != 1) ||
--                    (S_ISDIR(inode->i_mode) && inode->i_nlink != 2))
-+                    (S_ISDIR(inode->i_mode) && inode->i_nlink > 2))
-                         CERROR("found \"orphan\" %s %s with link count %d\n",
-                                S_ISREG(inode->i_mode) ? "file" : "dir",
-                                fidname, inode->i_nlink);
diff --git a/debian/patches/configure_error_on_unstable.patch 
b/debian/patches/configure_error_on_unstable.patch
deleted file mode 100755
index bf3c609..0000000
--- a/debian/patches/configure_error_on_unstable.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-## autogen.dpatch by Patrick Winnertz <win...@debian.org>
-## DP: fix configure on debian unstable
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/build/autoconf/lustre-build-linux.m4 
lustre/build/autoconf/lustre-build-linux.m4
---- lustre~/build/autoconf/lustre-build-linux.m4       2010-03-08 
10:25:09.000000000 +0100
-+++ lustre/build/autoconf/lustre-build-linux.m4        2010-03-08 
11:00:46.106781669 +0100
-@@ -343,7 +343,7 @@
- AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ 
EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-       [$4],
-       [_AC_MSG_LOG_CONFTEST
--m4_ifvaln([$5],[$5])dnl])dnl
-+m4_ifvaln([$5],[$5])dnl])
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o 
build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
- ])
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4 
lustre/ldiskfs/build/autoconf/lustre-build-linux.m4
---- lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4       2010-03-08 
10:25:09.000000000 +0100
-+++ lustre/ldiskfs/build/autoconf/lustre-build-linux.m4        2010-03-08 
11:01:09.629794696 +0100
-@@ -343,7 +343,7 @@
- AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ 
EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-       [$4],
-       [_AC_MSG_LOG_CONFTEST
--m4_ifvaln([$5],[$5])dnl])dnl
-+m4_ifvaln([$5],[$5])dnl])
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o 
build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
- ])
- 
diff --git a/debian/patches/inode-no-i_blksize-2.6.20.patch 
b/debian/patches/inode-no-i_blksize-2.6.20.patch
deleted file mode 100755
index b793444..0000000
--- a/debian/patches/inode-no-i_blksize-2.6.20.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-## inode-no-i_blksize-2.6.20.patch by Goswin von Brederlow <goswin-...@web.de>
-## DP: Patch from Q-Leap Networks
-
-diff -urNad lustre-1.6.2~/lustre/mds/handler.c 
lustre-1.6.2/lustre/mds/handler.c
---- lustre-1.6.2~/lustre/mds/handler.c 2007-09-06 14:41:18.000000000 +0200
-+++ lustre-1.6.2/lustre/mds/handler.c  2007-09-06 14:47:31.185757912 +0200
-@@ -1191,6 +1191,7 @@
-         struct lvfs_run_ctxt saved;
-         int rc, size[2] = { sizeof(struct ptlrpc_body), sizeof(*repbody) };
-         struct lvfs_ucred uc = {NULL,};
-+        int blksize;
-         ENTRY;
- 
-         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_READPAGE_PACK))
-@@ -1223,17 +1224,18 @@
-         if (IS_ERR(file))
-                 GOTO(out_pop, rc = PTR_ERR(file));
- 
-+        blksize = de->d_inode->i_sb->s_blocksize;
-         /* body->size is actually the offset -eeb */
--        if ((body->size & (de->d_inode->i_sb->s_blocksize - 1)) != 0) {
-+        if ((body->size & (blksize - 1)) != 0) {
-                 CERROR("offset "LPU64" not on a block boundary of %lu\n",
--                       body->size, de->d_inode->i_sb->s_blocksize);
-+                       body->size, blksize);
-                 GOTO(out_file, rc = -EFAULT);
-         }
- 
-         /* body->nlink is actually the #bytes to read -eeb */
--        if (body->nlink & (de->d_inode->i_sb->s_blocksize - 1)) {
-+        if (body->nlink & (blksize - 1)) {
-                 CERROR("size %u is not multiple of blocksize %lu\n",
--                       body->nlink, de->d_inode->i_sb->s_blocksize);
-+                       body->nlink, blksize);
-                 GOTO(out_file, rc = -EFAULT);
-         }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6c7b1da..ba9b7b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-# patches
 page-size-undef-fixes.patch
-#inode-no-i_blksize-2.6.20.patch
 posix_acl.patch
 ldiskfs-detect-2.6.20-2.6.22.patch
 no_default_debugging.patch
@@ -16,13 +14,10 @@ tex2pdf.patch
 lustre_config.patch
 fix-2.6.15-versioncheck.patch
 bug13852-quota_includes.patch
-###fix-lustre-manpage.patch
 enable-quota.patch
 fix-symlink-attack.patch
 use_bash_instead_of_sh.patch
-#hotfixes for 1.8.2:
 fix-oot-builds.patch
-###fix_various_typecasts.patch
 no-strict-aliasing.patch
 fix_bashisms_for_dash.patch
 fix_dentry_conf_test.patch

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to