[Pkg-lustre-svn-commit] updated: [ea79bf9] Needed to rediff one patch due to the sles11 quota patch

Patrick Winnertz winnie at debian.org
Wed Oct 28 11:20:17 UTC 2009


The following commit has been merged in the master branch:
commit ea79bf998e490b67b0a21b7f873e570d94fe6285
Author: Patrick Winnertz <winnie at debian.org>
Date:   Fri Oct 9 15:03:30 2009 +0200

    Needed to rediff one patch due to the sles11 quota patch
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/lustre/kernel_patches/patches/quota-support-64-bit-quota-format-2.6.27-vanilla.patch b/lustre/kernel_patches/patches/quota-support-64-bit-quota-format-2.6.27-vanilla.patch
index b359ee0..dcdff82 100644
--- a/lustre/kernel_patches/patches/quota-support-64-bit-quota-format-2.6.27-vanilla.patch
+++ b/lustre/kernel_patches/patches/quota-support-64-bit-quota-format-2.6.27-vanilla.patch
@@ -15,9 +15,9 @@ Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
 
 Index: linux-2.6.27.36/fs/quota_v2.c
 ===================================================================
---- linux-2.6.27.36.orig/fs/quota_v2.c	2009-10-08 16:34:36.000000000 +0200
-+++ linux-2.6.27.36/fs/quota_v2.c	2009-10-08 16:39:29.000000000 +0200
-@@ -23,18 +23,27 @@
+--- linux-2.6.27.36.orig/fs/quota_v2.c	2009-10-09 17:00:48.000000000 +0200
++++ linux-2.6.27.36/fs/quota_v2.c	2009-10-09 17:03:35.000000000 +0200
+@@ -23,14 +23,24 @@
  
  #define __QUOTA_V2_PARANOIA
  
@@ -34,28 +34,33 @@ Index: linux-2.6.27.36/fs/quota_v2.c
 +static int v2r0_is_id(void *dp, struct dquot *dquot);
 +
 +static struct qtree_fmt_operations v2r0_qtree_ops = {
-+	.mem2disk_dqblk = v2r0_mem2diskdqb,
-+	.disk2mem_dqblk = v2r0_disk2memdqb,
-+	.is_id = v2r0_is_id,
- };
- 
--/* Check whether given file is really vfsv0 quotafile */
--static int v2_check_quota_file(struct super_block *sb, int type)
++      .mem2disk_dqblk = v2r0_mem2diskdqb,
++      .disk2mem_dqblk = v2r0_disk2memdqb,
++      .is_id = v2r0_is_id,
++};
++
 +static void v2r1_mem2diskdqb(void *dp, struct dquot *dquot);
 +static void v2r1_disk2memdqb(struct dquot *dquot, void *dp);
 +static int v2r1_is_id(void *dp, struct dquot *dquot);
 +
 +static struct qtree_fmt_operations v2r1_qtree_ops = {
-+	.mem2disk_dqblk = v2r1_mem2diskdqb,
-+	.disk2mem_dqblk = v2r1_disk2memdqb,
-+	.is_id = v2r1_is_id,
-+};
-+
++      .mem2disk_dqblk = v2r1_mem2diskdqb,
++      .disk2mem_dqblk = v2r1_disk2memdqb,
++      .is_id = v2r1_is_id,
+ };
+ 
+ #define QUOTABLOCK_BITS 10
+@@ -46,8 +56,7 @@
+ 	return blocks << QUOTABLOCK_BITS;
+ }
+ 
+-/* Check whether given file is really vfsv0 quotafile */
+-static int v2_check_quota_file(struct super_block *sb, int type)
 +static int v2_check_quota_file_header(struct super_block *sb, int type)
  {
  	struct v2_disk_dqheader dqhead;
  	ssize_t size;
-@@ -45,12 +54,20 @@
+@@ -58,12 +67,20 @@
  	if (size != sizeof(struct v2_disk_dqheader)) {
  		printk("quota_v2: failed read expected=%zd got=%zd\n",
  			sizeof(struct v2_disk_dqheader), size);
@@ -81,7 +86,7 @@ Index: linux-2.6.27.36/fs/quota_v2.c
  }
  
  /* Read information header from quota file */
-@@ -59,7 +76,13 @@
+@@ -72,7 +89,13 @@
  	struct v2_disk_dqinfo dinfo;
  	struct mem_dqinfo *info = sb_dqinfo(sb, type);
  	ssize_t size;
@@ -95,7 +100,7 @@ Index: linux-2.6.27.36/fs/quota_v2.c
  	size = sb->s_op->quota_read(sb, type, (char *)&dinfo,
  	       sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
  	if (size != sizeof(struct v2_disk_dqinfo)) {
-@@ -68,8 +91,14 @@
+@@ -81,8 +104,14 @@
  		return -1;
  	}
  	/* limits are stored as unsigned 32-bit data */
@@ -112,7 +117,7 @@ Index: linux-2.6.27.36/fs/quota_v2.c
  	info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
  	info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);
  	info->dqi_flags = le32_to_cpu(dinfo.dqi_flags);
-@@ -81,8 +110,13 @@
+@@ -94,8 +123,13 @@
  	info->u.v2_i.i.dqi_blocksize_bits = V2_DQBLKSIZE_BITS;
  	info->u.v2_i.i.dqi_usable_bs = 1 << V2_DQBLKSIZE_BITS;
  	info->u.v2_i.i.dqi_qtree_depth = qtree_depth(&info->u.v2_i.i);
@@ -128,7 +133,7 @@ Index: linux-2.6.27.36/fs/quota_v2.c
  	return 0;
  }
  
-@@ -112,9 +146,9 @@
+@@ -125,9 +159,9 @@
  	return 0;
  }
  
@@ -140,7 +145,7 @@ Index: linux-2.6.27.36/fs/quota_v2.c
  	struct mem_dqblk *m = &dquot->dq_dqb;
  
  	m->dqb_ihardlimit = le32_to_cpu(d->dqb_ihardlimit);
-@@ -126,15 +160,15 @@
+@@ -139,15 +173,15 @@
  	m->dqb_curspace = le64_to_cpu(d->dqb_curspace);
  	m->dqb_btime = le64_to_cpu(d->dqb_btime);
  	/* We need to escape back all-zero structure */
@@ -160,7 +165,7 @@ Index: linux-2.6.27.36/fs/quota_v2.c
  	struct mem_dqblk *m = &dquot->dq_dqb;
  	struct qtree_mem_dqinfo *info =
  			&sb_dqinfo(dquot->dq_sb, dquot->dq_type)->u.v2_i.i;
-@@ -152,9 +186,60 @@
+@@ -165,9 +199,60 @@
  		d->dqb_itime = cpu_to_le64(1);
  }
  
@@ -225,8 +230,8 @@ Index: linux-2.6.27.36/fs/quota_v2.c
  
 Index: linux-2.6.27.36/include/linux/quotaio_v2.h
 ===================================================================
---- linux-2.6.27.36.orig/include/linux/quotaio_v2.h	2009-10-08 16:32:48.000000000 +0200
-+++ linux-2.6.27.36/include/linux/quotaio_v2.h	2009-10-08 16:36:48.000000000 +0200
+--- linux-2.6.27.36.orig/include/linux/quotaio_v2.h	2009-10-09 17:00:48.000000000 +0200
++++ linux-2.6.27.36/include/linux/quotaio_v2.h	2009-10-09 17:00:56.000000000 +0200
 @@ -17,8 +17,8 @@
  }
  

-- 
Lustre Debian Packaging 



More information about the Pkg-lustre-svn-commit mailing list