diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 22:15:21 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 22:15:21 +0400 |
commit | ebf572b448757190027d8ee34e73deb989ec7b60 (patch) | |
tree | 2320a92b1aed2c9475e291d75c92616af75e195a /fs/fuse/fuse_i.h | |
parent | 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
download | linux-ebf572b448757190027d8ee34e73deb989ec7b60.tar.xz |
Merge branch 'from-linus' into bcm43xx
Diffstat (limited to 'fs/fuse/fuse_i.h')
-rw-r--r-- | fs/fuse/fuse_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 0dbf96621841..69c7750d55b8 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -59,7 +59,7 @@ struct fuse_inode { struct fuse_req *forget_req; /** Time in jiffies until the file attributes are valid */ - unsigned long i_time; + u64 i_time; }; /** FUSE specific file data */ |