[Pkg-lustre-svn-commit] r415 - in /trunk/debian: changelog patches/00list patches/quota-reset.dpatch

[winnie at users.alioth.debian.org]

Author: winnie
Date: Wed Jan  2 13:53:14 2008
New Revision: 415

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=415
Log:
Add patch mentioned in email

Added:
    trunk/debian/patches/quota-reset.dpatch
Modified:
    trunk/debian/changelog
    trunk/debian/patches/00list

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=415&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Jan  2 13:53:14 2008
@@ -1,8 +1,8 @@
 lustre (1.6.4.1-2) UNRELEASED; urgency=low
 
-  * 
-
- -- Patrick Winnertz <winnie at debian.org>  Wed, 02 Jan 2008 11:37:20 +0100
+  * Fix for quota reset issue
+
+ -- Patrick Winnertz <winnie at debian.org>  Wed, 02 Jan 2008 14:50:43 +0100
 
 lustre (1.6.4.1-1) unstable; urgency=low
 

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=415&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Jan  2 13:53:14 2008
@@ -11,6 +11,7 @@
 remove-set_tunables.dpatch
 libsysio.dpatch
 remove-fiemaph.dpatch
+quota-reset.dpatch
 
 # Debian patches
 bash_completion.dpatch

Added: trunk/debian/patches/quota-reset.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/quota-reset.dpatch?rev=415&op=file
==============================================================================
--- trunk/debian/patches/quota-reset.dpatch (added)
+++ trunk/debian/patches/quota-reset.dpatch Wed Jan  2 13:53:14 2008
@@ -1,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## posix_acl.patch by Patrick Winnertz <winnie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from upstream bts (https://bugzilla.lustre.org/attachment.cgi?id=8709)
+
+ at DPATCH@
+diff -u -p -r1.143.2.21.2.89 filter.c
+--- lustre/obdfilter/filter.c	10 Oct 2006 21:10:22 -0000	1.143.2.21.2.89
++++ lustre/obdfilter/filter.c	17 Oct 2006 09:14:57 -0000
+@@ -2328,6 +2328,7 @@ int filter_setattr_internal(struct obd_e
+         }
+ 
+         if (ia_valid & ATTR_SIZE || ia_valid & (ATTR_UID | ATTR_GID)) {
++                DQUOT_INIT(inode);
+                 LOCK_INODE_MUTEX(inode);
+                 locked = 1;
+         }
+@@ -2939,6 +2940,7 @@ int filter_destroy(struct obd_export *ex
+                 if (fcc != NULL)
+                         memcpy(fcc, obdo_logcookie(oa), sizeof(*fcc));
+         }
++        DQUOT_INIT(dchild->d_inode);
+ 
+         /* we're gonna truncate it first in order to avoid possible deadlock:
+          *      P1                      P2
+diff -u -p -r1.6.2.6.2.38 filter_io_26.c
+--- lustre/obdfilter/filter_io_26.c	10 Oct 2006 21:10:22 -0000	1.6.2.6.2.38
++++ lustre/obdfilter/filter_io_26.c	17 Oct 2006 09:14:57 -0000
+@@ -641,6 +641,8 @@ int filter_commitrw_write(struct obd_exp
+         push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+         cleanup_phase = 2;
+ 
++        DQUOT_INIT(inode);
++        
+         LOCK_INODE_MUTEX(inode);
+         fsfilt_check_slow(obd, now, obd_timeout, "i_mutex");
+         oti->oti_handle = fsfilt_brw_start(obd, objcount, &fso, niocount, res,
+