merge xfs up to 2.5.35

Date:  Mon Sep 16 09:10:25 PDT 2002
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge.2.5
Author:  lord

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs

Modid:  2.5.x-xfs:slinx:127481a
linux/fs/xfs/linux/xfs_lrw.c - 1.166
linux/fs/xfs/support/time.h - 1.7
linux/fs/xfs/linux/xfs_aops.c - 1.5

diff --git a/fs/xfs/linux/xfs_aops.c b/fs/xfs/linux/xfs_aops.c
index f0ba052d1b7de14ad7811fa63d11c1bffcfbe621..72202e5a89ffe55e8a26b5dd1ce1b5ee4475a2bd 100644 (file)
--- a/fs/xfs/linux/xfs_aops.c
+++ b/fs/xfs/linux/xfs_aops.c
@@ -653,11 +653,11 @@ STATIC int
 linvfs_direct_IO(
        int                     rw,
        struct inode            *inode,
-       char                    *buf,
+       const struct iovec      *iov,
        loff_t                  offset,
-       size_t                  count)
+       unsigned long           nr_segs)
 {
-        return generic_direct_IO(rw, inode, buf, offset, count, 
+        return generic_direct_IO(rw, inode, iov, offset, nr_segs,
                                        linvfs_get_blocks_direct);
 }
 

diff --git a/fs/xfs/linux/xfs_lrw.c b/fs/xfs/linux/xfs_lrw.c
index b338349bf5b50af7c18af230143fe76d5397104c..abb820267d95611598e3fa0e547f1f37b1dc4e16 100644 (file)
--- a/fs/xfs/linux/xfs_lrw.c
+++ b/fs/xfs/linux/xfs_lrw.c
@@ -433,6 +433,7 @@ xfs_write(
        xfs_fsize_t     n, limit = XFS_MAX_FILE_OFFSET;
        xfs_iocore_t    *io;
        vnode_t         *vp;
+       struct iovec    iov;
        int             iolock;
        int             direct = file->f_flags & O_DIRECT;
        int             eventsent = 0;
@@ -571,7 +572,10 @@ retry:
                xfs_inval_cached_pages(vp, &xip->i_iocore, *offset, 1, 1);
        }
 
-       ret = generic_file_write_nolock(file, buf, size, offset);
+       iov.iov_base = (void *)buf;
+       iov.iov_len = size;
+
+       ret = generic_file_write_nolock(file, &iov, 1, offset);
 
        if ((ret == -ENOSPC) &&
            DM_EVENT_ENABLED(vp->v_vfsp, xip, DM_EVENT_NOSPACE) &&

diff --git a/fs/xfs/linux/xfs_version.h b/fs/xfs/linux/xfs_version.h
index 4799b964233de1b2e8b53a183d9c2ffebe2d48ea..5a41ef00df683aee6b59f32cbe90e7d13829d9c3 100644 (file)
--- a/fs/xfs/linux/xfs_version.h
+++ b/fs/xfs/linux/xfs_version.h
@@ -39,6 +39,6 @@
 #ifndef __XFS_VERSION_H__
 #define __XFS_VERSION_H__
 
-#define XFS_VERSION_STRING "CVS-09/13/02:21"
+#define XFS_VERSION_STRING "CVS-09/15/02:17"
 
 #endif /* __XFS_VERSION_H__ */

diff --git a/fs/xfs/support/time.h b/fs/xfs/support/time.h
index f48b48e6fea4f7bf862db632ccf7e22dbcd2b5d7..f0a488fb4f636c775b9f2f799065f34cd1011407 100644 (file)
--- a/fs/xfs/support/time.h
+++ b/fs/xfs/support/time.h
@@ -43,7 +43,7 @@ static inline void delay(long ticks)
 static inline void nanotime(struct timespec *tvp)
 {
        tvp->tv_sec = xtime.tv_sec;
-       tvp->tv_nsec = xtime.tv_usec * 1000;
+       tvp->tv_nsec = xtime.tv_nsec;
 }
 
 #endif /* __XFS_SUPPORT_TIME_H__ */