Commit 4ff17ba8 authored by Christoph Hellwig's avatar Christoph Hellwig

Merge

parents f67dd842 73b3ecd8
......@@ -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);
}
......
......@@ -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 @@ xfs_write(
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) &&
......
......@@ -39,6 +39,6 @@
#ifndef __XFS_VERSION_H__
#define __XFS_VERSION_H__
#define XFS_VERSION_STRING "CVS"
#define XFS_VERSION_STRING "CVS-09/15/02:17"
#endif /* __XFS_VERSION_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__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment