From: Russ Allbery <allbery@ece.cmu.edu>
Date: Sat, 23 Jun 2001 18:17:09 +0000 (+0000)
Subject: linux-changes-needed-to-compile-with-suse-included-patches-20010623
X-Git-Tag: openafs-stable-1_1_0~87
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=9e31595353e35678792819f0f758d497679fb284

linux-changes-needed-to-compile-with-suse-included-patches-20010623


ifdef may need to be changed but should work until autoconf
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 8091be9..c6497e5 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -230,7 +230,7 @@ tagain:
 	len = strlen(de->name);
 
 	/* filldir returns -EINVAL when the buffer is full. */
-#ifdef AFS_LINUX24_ENV
+#if (defined(AFS_LINUX24_ENV) || defined(pgoff2loff)) && defined(DECLARE_FSTYPE)
         {
              unsigned int type=DT_UNKNOWN;
              struct VenusFid afid;
@@ -1319,7 +1319,7 @@ int afs_linux_updatepage(struct file *fp, struct page *pp,
 	       ICL_TYPE_POINTER, pp,
 	       ICL_TYPE_INT32, atomic_read(&pp->count),
 	       ICL_TYPE_INT32, 99999);
-    setup_uio(&tuio, &iovec, page_addr + offset, pp->offset + offset, count,
+    setup_uio(&tuio, &iovec, page_addr + offset, pageoff(pp) + offset, count,
 	      UIO_WRITE, AFS_UIOSYS);
 
     code = afs_write(vcp, &tuio, fp->f_flags, credp, 0);