The following commit has been merged in the master branch:
commit 71ba8575824ff5a4f8c6154849703d27401c408d
Author: Marco Nelles <marco.nel...@credativ.de>
Date:   Wed Aug 22 12:42:44 2012 +0200

    lustre-kernel-patchset adapted.

diff --git a/debian/control b/debian/control
index 35c58eb..d20bc70 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: lustre
 Section: admin
 Priority: optional
 Maintainer: Debian Lustre Packaging team 
<pkg-lustre-maintain...@lists.alioth.debian.org>
-Uploaders: Patrick Winnertz <win...@debian.org>, Noèl Köthe <n...@debian.org>
+Uploaders: Marco Nelles <marco.nel...@credativ.de>, Patrick Winnertz 
<win...@debian.org>
 Standards-Version: 3.9.1
 Build-Depends: libreadline-dev, debhelper (>=6.0.7), dh-kpatches (>= 0.99.3), 
lyx, automake1.11, libsnmp-dev, bzip2, texlive-extra-utils, quilt, 
texlive-latex-recommended, libncurses-dev 
 Homepage: http://www.lustre.org/
@@ -19,10 +19,8 @@ Description: Linux kernel patch for the Lustre Filesystem
  and available from http://www.lustre.org
  .
  Lustre servers require a number of patches to the core Linux kernel,
- mostly to export new functions, add features to ext3, and add 
- a new locking path to the VFS. This package provides these patches
- for kernel versions 2.6.18, 2.6.21 and 2.6.22 on i386, amd64, powerpc 
- and ia64 architectures.
+ mostly to export new functions and add features to ext4. This package
+ provides these patches for kernel version 2.6.32 on amd64 architectures.
  .
  For Lustre clients, you will also need to build a lustre-modules
  package, using the lustre-source package and module-assistant.
@@ -43,7 +41,7 @@ Description: source for Lustre filesystem client kernel 
modules
 Package: lustre-utils
 Section: utils
 Architecture: amd64 ia64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ldiskfsprogs (>= 1.42.3), ${shlibs:Depends}, ${misc:Depends}
 Description: Userspace utilities for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  It is maintained by Cluster Filesystems, Inc. and available from 
diff --git a/debian/patches/lustre-kernel-patchset.patch 
b/debian/patches/lustre-kernel-patchset.patch
index ac96d5f..e1dda15 100644
--- a/debian/patches/lustre-kernel-patchset.patch
+++ b/debian/patches/lustre-kernel-patchset.patch
@@ -1305,16 +1305,16 @@ index 0000000..bf5e226
 ++     stats->iostat_queue_depth--;
 ++
 ++     /* update seek stats. XXX: not sure about nr_sectors */
-++     stats->iostat_sectors += rq->nr_sectors;
+++     stats->iostat_sectors += blk_rq_sectors(rq);
 ++     stats->iostat_reqs++;
-++     if (rq->sector != stats->iostat_next_sector) {
+++     if (blk_rq_pos(rq) != stats->iostat_next_sector) {
 ++             stats->iostat_seek_sectors +=
-++                     rq->sector > stats->iostat_next_sector ?
-++                     rq->sector - stats->iostat_next_sector :
-++                     stats->iostat_next_sector - rq->sector;
+++                     blk_rq_pos(rq) > stats->iostat_next_sector ?
+++                     blk_rq_pos(rq) - stats->iostat_next_sector :
+++                     stats->iostat_next_sector - blk_rq_pos(rq);
 ++             stats->iostat_seeks++;
 ++     }
-++     stats->iostat_next_sector = rq->sector + rq->nr_sectors;
+++     stats->iostat_next_sector = blk_rq_pos(rq) + blk_rq_sectors(rq);
 ++
 ++     stats->iostat_queue_stamp = jiffies;
 ++

-- 
Lustre Debian Packaging 

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

Reply via email to