aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2013-07-20 14:50:35 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2013-07-20 14:50:35 +0000
commitfeba8afb5980d3f96d2d7dbb2c98dbce39be8490 (patch)
treee7daaa7e46b9bbdf674a4b25aa63b17bd44a75b3
parentda6335eb54bb33dd94c84fb93b3bc60faa9a8a77 (diff)
downloadsrc-feba8afb5980d3f96d2d7dbb2c98dbce39be8490.tar.gz
src-feba8afb5980d3f96d2d7dbb2c98dbce39be8490.zip
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.
Notes
Notes: svn path=/head/; revision=253498
-rw-r--r--sys/fs/fuse/fuse_internal.h2
-rw-r--r--sys/fs/fuse/fuse_kernel.h7
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/fs/fuse/fuse_internal.h b/sys/fs/fuse/fuse_internal.h
index d29fd3068d30..187245cbd907 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 c3b8d5bba02c..89061876b6b7 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 */