From: Russ Allbery <rra@debian.org>
Date: Thu, 12 Feb 2009 18:55:36 +0000 (-0800)
Subject: Apply upstream STABLE14-linux-i-size-20090112
X-Git-Tag: debian/1.4.8.dfsg1-1~28
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9e26b0b11043937a09da5fc397a09b175650ca84;p=packages%2Fo%2Fopenafs.git

Apply upstream STABLE14-linux-i-size-20090112

A further fix on top of STABLE14-linux-truncate-race-20090109.
---

diff --git a/debian/changelog b/debian/changelog
index 786100e1b..7d84cafe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ openafs (1.4.8.dfsg1-1) UNRELEASED; urgency=low
     - STABLE14-libuafs-updates-20081229: prerequisite for other deltas.
     - STABLE14-linux-truncate-race-20090109: avoid race condition during
       truncation.
+    - STABLE14-linux-i-size-20090112: further fix for truncation race.
   * Make dynroot the default for new installations.  It works much better
     with systems that don't bring up their network until late in the boot
     process, such as wireless laptops.  (LP: #249240, #318605)
diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index 17d581110..8361981bb 100644
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -11,7 +11,7 @@
 #include "afs/param.h"
 
 RCSID
-    ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.19.2.17 2009/01/09 14:58:03 shadow Exp $");
+    ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.19.2.18 2009/01/12 14:19:29 shadow Exp $");
 
 #ifdef AFS_LINUX24_ENV
 #include "h/module.h" /* early to avoid printf->printk mapping */
@@ -82,7 +82,7 @@ osi_UFSOpen(afs_int32 ainode)
     if (IS_ERR(filp))
 	osi_Panic("Can't open inode %d\n", ainode);
     afile->filp = filp;
-    afile->size = i_size_read(FILE_INODE(filp)->i_size);
+    afile->size = i_size_read(FILE_INODE(filp));
     AFS_GLOCK();
     afile->offset = 0;
     afile->proc = (int (*)())0;