diff options
author | Dominique Quatravaux <dominique@quatravaux.org> | 2008-02-05 01:31:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:30 -0500 |
commit | d7b88513c504e49d450b0f89f80ba9d451a3c804 (patch) | |
tree | 12af1040a75fd1909f30f5d3ebbdddb0d246b6c3 /fs | |
parent | c5d4bb171cab17576779a51d23d313abcb3db102 (diff) |
uml: fix hostfs tv_usec calculations
To convert from tv_nsec to tv_usec, one needs to divide by 1000, not multiply.
Signed-off-by: Dominique Quatravaux <dominique@quatravaux.org>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/hostfs/hostfs_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c index 35c1a9f33f47..53fd0a67c11a 100644 --- a/fs/hostfs/hostfs_user.c +++ b/fs/hostfs/hostfs_user.c | |||
@@ -285,17 +285,17 @@ int set_attr(const char *file, struct hostfs_iattr *attrs, int fd) | |||
285 | return err; | 285 | return err; |
286 | 286 | ||
287 | times[0].tv_sec = atime_ts.tv_sec; | 287 | times[0].tv_sec = atime_ts.tv_sec; |
288 | times[0].tv_usec = atime_ts.tv_nsec * 1000; | 288 | times[0].tv_usec = atime_ts.tv_nsec / 1000; |
289 | times[1].tv_sec = mtime_ts.tv_sec; | 289 | times[1].tv_sec = mtime_ts.tv_sec; |
290 | times[1].tv_usec = mtime_ts.tv_nsec * 1000; | 290 | times[1].tv_usec = mtime_ts.tv_nsec / 1000; |
291 | 291 | ||
292 | if (attrs->ia_valid & HOSTFS_ATTR_ATIME_SET) { | 292 | if (attrs->ia_valid & HOSTFS_ATTR_ATIME_SET) { |
293 | times[0].tv_sec = attrs->ia_atime.tv_sec; | 293 | times[0].tv_sec = attrs->ia_atime.tv_sec; |
294 | times[0].tv_usec = attrs->ia_atime.tv_nsec * 1000; | 294 | times[0].tv_usec = attrs->ia_atime.tv_nsec / 1000; |
295 | } | 295 | } |
296 | if (attrs->ia_valid & HOSTFS_ATTR_MTIME_SET) { | 296 | if (attrs->ia_valid & HOSTFS_ATTR_MTIME_SET) { |
297 | times[1].tv_sec = attrs->ia_mtime.tv_sec; | 297 | times[1].tv_sec = attrs->ia_mtime.tv_sec; |
298 | times[1].tv_usec = attrs->ia_mtime.tv_nsec * 1000; | 298 | times[1].tv_usec = attrs->ia_mtime.tv_nsec / 1000; |
299 | } | 299 | } |
300 | 300 | ||
301 | if (fd >= 0) { | 301 | if (fd >= 0) { |