[Pkg-lustre-svn-commit] r279 - /trunk/debian/patches/inode-no-i_blksize-2.6.20.patch

[goswin-guest at users.alioth.debian.org]

Author: goswin-guest
Date: Thu Sep  6 12:49:27 2007
New Revision: 279

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=279
Log:
Fix fatal "warning: 'blksize' is used uninitialized in this function".
One line was missing in that patch.


Modified:
    trunk/debian/patches/inode-no-i_blksize-2.6.20.patch

Modified: trunk/debian/patches/inode-no-i_blksize-2.6.20.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/inode-no-i_blksize-2.6.20.patch?rev=279&op=diff
==============================================================================
--- trunk/debian/patches/inode-no-i_blksize-2.6.20.patch (original)
+++ trunk/debian/patches/inode-no-i_blksize-2.6.20.patch Thu Sep  6 12:49:27 2007
@@ -6,8 +6,8 @@
 
 @DPATCH@
 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-04 14:41:43.559316613 +0200
-+++ lustre-1.6.2/lustre/mds/handler.c	2007-09-04 14:46:23.242649167 +0200
+--- 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) };
@@ -16,9 +16,11 @@
          ENTRY;
  
          if (OBD_FAIL_CHECK(OBD_FAIL_MDS_READPAGE_PACK))
-@@ -1224,16 +1225,16 @@
+@@ -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) {