Date: Fri, 21 Jun 2019 02:55:43 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r349258 - projects/fuse2/sys/fs/fuse Message-ID: <201906210255.x5L2thQl022948@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Fri Jun 21 02:55:43 2019 New Revision: 349258 URL: https://svnweb.freebsd.org/changeset/base/349258 Log: fusefs: diff reduction of fuse_kernel.h vs the upstream version fuse_kernel.h is based on Linux's fuse.h. In r349250 I modified fuse_kernel.h by generating a diff of two versions of Linux's fuse.h and applying it to our tree. patch succeeded, but it put one chunk in the wrong location. This commit fixes that. No functional changes. Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/sys/fs/fuse/fuse_kernel.h Modified: projects/fuse2/sys/fs/fuse/fuse_kernel.h ============================================================================== --- projects/fuse2/sys/fs/fuse/fuse_kernel.h Fri Jun 21 02:49:36 2019 (r349257) +++ projects/fuse2/sys/fs/fuse/fuse_kernel.h Fri Jun 21 02:55:43 2019 (r349258) @@ -565,31 +565,6 @@ struct fuse_notify_poll_wakeup_out { __u64 kh; }; -struct fuse_notify_store_out { - __u64 nodeid; - __u64 offset; - __u32 size; - __u32 padding; -}; - -struct fuse_notify_retrieve_out { - __u64 notify_unique; - __u64 nodeid; - __u64 offset; - __u32 size; - __u32 padding; -}; - -/* Matches the size of fuse_write_in */ -struct fuse_notify_retrieve_in { - __u64 dummy1; - __u64 offset; - __u32 size; - __u32 dummy2; - __u64 dummy3; - __u64 dummy4; -}; - struct fuse_in_header { __u32 len; __u32 opcode; @@ -630,6 +605,31 @@ struct fuse_notify_inval_entry_out { __u64 parent; __u32 namelen; __u32 padding; +}; + +struct fuse_notify_store_out { + __u64 nodeid; + __u64 offset; + __u32 size; + __u32 padding; +}; + +struct fuse_notify_retrieve_out { + __u64 notify_unique; + __u64 nodeid; + __u64 offset; + __u32 size; + __u32 padding; +}; + +/* Matches the size of fuse_write_in */ +struct fuse_notify_retrieve_in { + __u64 dummy1; + __u64 offset; + __u32 size; + __u32 dummy2; + __u64 dummy3; + __u64 dummy4; }; #endif /* _FUSE_FUSE_KERNEL_H */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906210255.x5L2thQl022948>