diff options
| author | pfg <pfg@FreeBSD.org> | 2013-07-20 14:50:35 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2013-07-20 14:50:35 +0000 |
| commit | 7d8d22f309757a90e57cd2f71707a5a99efb33a2 (patch) | |
| tree | e7daaa7e46b9bbdf674a4b25aa63b17bd44a75b3 /sys/fs/fuse | |
| parent | 12374a43f84496be680a5bb0183a3cf3b119f23d (diff) | |
| download | FreeBSD-src-7d8d22f309757a90e57cd2f71707a5a99efb33a2.zip FreeBSD-src-7d8d22f309757a90e57cd2f71707a5a99efb33a2.tar.gz | |
fuse: revert birthtime support.
The creation time support breaks the data structures used in linux
fuse. libfuse carries it's own header.
Revert the changes for now. We will try to get an agreement with the
fuse upstream maintainers to avoid having to patch the library
headers all the time.
Diffstat (limited to 'sys/fs/fuse')
| -rw-r--r-- | sys/fs/fuse/fuse_internal.h | 2 | ||||
| -rw-r--r-- | sys/fs/fuse/fuse_kernel.h | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/fs/fuse/fuse_internal.h b/sys/fs/fuse/fuse_internal.h index d29fd30..187245c 100644 --- a/sys/fs/fuse/fuse_internal.h +++ b/sys/fs/fuse/fuse_internal.h @@ -223,8 +223,6 @@ fuse_internal_attr_fat2vat(struct mount *mp, vap->va_mtime.tv_nsec = fat->mtimensec; vap->va_ctime.tv_sec = fat->ctime; vap->va_ctime.tv_nsec = fat->ctimensec; - vap->va_birthtime.tv_sec = fat->crtime; - vap->va_birthtime.tv_nsec = fat->crtimensec; vap->va_blocksize = PAGE_SIZE; vap->va_type = IFTOVT(fat->mode); diff --git a/sys/fs/fuse/fuse_kernel.h b/sys/fs/fuse/fuse_kernel.h index c3b8d5b..8906187 100644 --- a/sys/fs/fuse/fuse_kernel.h +++ b/sys/fs/fuse/fuse_kernel.h @@ -81,17 +81,16 @@ struct fuse_attr { __u64 atime; __u64 mtime; __u64 ctime; - __u64 crtime; __u32 atimensec; __u32 mtimensec; __u32 ctimensec; - __u32 crtimensec; __u32 mode; __u32 nlink; __u32 uid; __u32 gid; __u32 rdev; __u32 blksize; + __u32 padding; }; struct fuse_kstatfs { @@ -222,7 +221,7 @@ enum fuse_opcode { /* The read buffer is required to be at least 8k, but may be much larger */ #define FUSE_MIN_READ_BUFFER 8192 -#define FUSE_COMPAT_ENTRY_OUT_SIZE 128 +#define FUSE_COMPAT_ENTRY_OUT_SIZE 120 struct fuse_entry_out { __u64 nodeid; /* Inode ID */ @@ -245,7 +244,7 @@ struct fuse_getattr_in { __u64 fh; }; -#define FUSE_COMPAT_ATTR_OUT_SIZE 104 +#define FUSE_COMPAT_ATTR_OUT_SIZE 96 struct fuse_attr_out { __u64 attr_valid; /* Cache timeout for the attributes */ |
