Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 20 Jul 2013 14:50:35 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r253498 - head/sys/fs/fuse
Message-ID:  <201307201450.r6KEoZD8012875@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pfg
Date: Sat Jul 20 14:50:35 2013
New Revision: 253498
URL: http://svnweb.freebsd.org/changeset/base/253498

Log:
  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.

Modified:
  head/sys/fs/fuse/fuse_internal.h
  head/sys/fs/fuse/fuse_kernel.h

Modified: head/sys/fs/fuse/fuse_internal.h
==============================================================================
--- head/sys/fs/fuse/fuse_internal.h	Sat Jul 20 13:52:40 2013	(r253497)
+++ head/sys/fs/fuse/fuse_internal.h	Sat Jul 20 14:50:35 2013	(r253498)
@@ -223,8 +223,6 @@ fuse_internal_attr_fat2vat(struct mount 
     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);
 

Modified: head/sys/fs/fuse/fuse_kernel.h
==============================================================================
--- head/sys/fs/fuse/fuse_kernel.h	Sat Jul 20 13:52:40 2013	(r253497)
+++ head/sys/fs/fuse/fuse_kernel.h	Sat Jul 20 14:50:35 2013	(r253498)
@@ -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 */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307201450.r6KEoZD8012875>