1 files changed, 147 insertions, 196 deletions

diff --git a/sys/fs/fuse/fuse_internal.h b/sys/fs/fuse/fuse_internal.h
index ae986a81ca48..057c28883139 100644
--- a/sys/fs/fuse/fuse_internal.h
+++ b/sys/fs/fuse/fuse_internal.h
@@ -68,116 +68,114 @@
 #include "fuse_ipc.h"
 #include "fuse_node.h"
 
-static __inline int
+static inline bool
 vfs_isrdonly(struct mount *mp)
 {
-    return ((mp->mnt_flag & MNT_RDONLY) != 0 ? 1 : 0);
+	return ((mp->mnt_flag & MNT_RDONLY) != 0);
 }
 
-static __inline struct mount *
+static inline struct mount *
 vnode_mount(struct vnode *vp)
 {
 	return (vp->v_mount);
 }
 
-static __inline int
+static inline bool
 vnode_mountedhere(struct vnode *vp)
 {
-	return (vp->v_mountedhere != NULL ? 1 : 0);
+	return (vp->v_mountedhere != NULL);
 }
 
-static __inline enum vtype
+static inline enum vtype
 vnode_vtype(struct vnode *vp)
 {
-    return (vp->v_type);
+	return (vp->v_type);
 }
 
-static __inline int
+static inline bool
 vnode_isvroot(struct vnode *vp)
 {
-    return ((vp->v_vflag & VV_ROOT) != 0 ? 1 : 0);
+	return ((vp->v_vflag & VV_ROOT) != 0);
 }
 
-static __inline int
+static inline bool
 vnode_isreg(struct vnode *vp)
 {
-    return (vp->v_type == VREG ? 1 : 0);
+	return (vp->v_type == VREG);
 }
 
-static __inline int
+static inline bool
 vnode_isdir(struct vnode *vp)
 {
-    return (vp->v_type == VDIR ? 1 : 0);
+	return (vp->v_type == VDIR);
 }
 
-static __inline int
+static inline bool
 vnode_islnk(struct vnode *vp)
 {
-    return (vp->v_type == VLNK ? 1 : 0);
+	return (vp->v_type == VLNK);
 }
 
-static __inline ssize_t
+static inline ssize_t
 uio_resid(struct uio *uio)
 {
-    return (uio->uio_resid);
+	return (uio->uio_resid);
 }
 
-static __inline off_t
+static inline off_t
 uio_offset(struct uio *uio)
 {
-    return (uio->uio_offset);
+	return (uio->uio_offset);
 }
 
-static __inline void
+static inline void
 uio_setoffset(struct uio *uio, off_t offset)
 {
-    uio->uio_offset = offset;
+	uio->uio_offset = offset;
 }
 
-static __inline void
+static inline void
 uio_setresid(struct uio *uio, ssize_t resid)
 {
-    uio->uio_resid = resid;
+	uio->uio_resid = resid;
 }
 
 /* miscellaneous */
 
-static __inline__
-int
+static inline bool
 fuse_isdeadfs(struct vnode *vp)
 {
-    struct fuse_data *data = fuse_get_mpdata(vnode_mount(vp));
+	struct fuse_data *data = fuse_get_mpdata(vnode_mount(vp));
 
-    return (data->dataflags & FSESS_DEAD);
+	return (data->dataflags & FSESS_DEAD);
 }
 
-static __inline__
-int
+static inline uint64_t
 fuse_iosize(struct vnode *vp)
 {
-    return vp->v_mount->mnt_stat.f_iosize;
+	return (vp->v_mount->mnt_stat.f_iosize);
 }
 
 /* access */
 
-#define FVP_ACCESS_NOOP   0x01
+#define FVP_ACCESS_NOOP		0x01
 
-#define FACCESS_VA_VALID   0x01
-#define FACCESS_DO_ACCESS  0x02
-#define FACCESS_STICKY     0x04
-#define FACCESS_CHOWN      0x08
-#define FACCESS_NOCHECKSPY 0x10
-#define FACCESS_SETGID     0x12
+#define FACCESS_VA_VALID	0x01
+#define FACCESS_DO_ACCESS	0x02
+#define FACCESS_STICKY		0x04
+#define FACCESS_CHOWN		0x08
+#define FACCESS_NOCHECKSPY	0x10
+#define FACCESS_SETGID		0x12
 
-#define FACCESS_XQUERIES FACCESS_STICKY | FACCESS_CHOWN | FACCESS_SETGID
+#define FACCESS_XQUERIES	(FACCESS_STICKY | FACCESS_CHOWN | FACCESS_SETGID)
 
 struct fuse_access_param {
-    uid_t    xuid;
-    gid_t    xgid;
-    uint32_t facc_flags;
+	uid_t		xuid;
+	gid_t		xgid;
+	uint32_t	facc_flags;
 };
 
-static __inline int
+static inline int
 fuse_match_cred(struct ucred *basecred, struct ucred *usercred)
 {
 	if (basecred->cr_uid == usercred->cr_uid             &&
@@ -186,17 +184,13 @@ fuse_match_cred(struct ucred *basecred, struct ucred *usercred)
 	    basecred->cr_groups[0] == usercred->cr_groups[0] &&
 	    basecred->cr_groups[0] == usercred->cr_rgid      &&
 	    basecred->cr_groups[0] == usercred->cr_svgid)
-		return 0;
+		return (0);
 
-	return EPERM;
+	return (EPERM);
 }
 
-int
-fuse_internal_access(struct vnode *vp,
-                     mode_t mode,
-                     struct fuse_access_param *facp,
-                     struct thread *td,
-                     struct ucred *cred);
+int fuse_internal_access(struct vnode *vp, mode_t mode,
+    struct fuse_access_param *facp, struct thread *td, struct ucred *cred);
 
 /* attributes */
 
@@ -209,186 +203,143 @@ fuse_internal_access(struct vnode *vp,
  * If the nominal attribute cache TTL is zero, do not cache on the 'vp' (but do
  * return the result to the caller).
  */
-static __inline
-void
-fuse_internal_attr_fat2vat(struct vnode *vp,
-                           struct fuse_attr *fat,
-                           uint64_t attr_valid,
-                           uint32_t attr_valid_nsec,
-                           struct vattr *vap)
+static inline void
+fuse_internal_attr_fat2vat(struct vnode *vp, struct fuse_attr *fat,
+    uint64_t attr_valid, uint32_t attr_valid_nsec, struct vattr *vap)
 {
-    struct mount *mp;
-    struct fuse_vnode_data *fvdat;
-    struct vattr *vp_cache_at;
-
-    mp = vnode_mount(vp);
-    fvdat = VTOFUD(vp);
-
-    DEBUGX(FUSE_DEBUG_INTERNAL,
-        "node #%ju, mode 0%o\n", (uintmax_t)fat->ino, fat->mode);
-
-    /* Honor explicit do-not-cache requests from user filesystems. */
-    if (attr_valid == 0 && attr_valid_nsec == 0)
-        fvdat->valid_attr_cache = false;
-    else
-        fvdat->valid_attr_cache = true;
-
-    vp_cache_at = VTOVA(vp);
-
-    if (vap == NULL && vp_cache_at == NULL)
-        return;
-
-    if (vap == NULL)
-        vap = vp_cache_at;
-
-    vattr_null(vap);
-
-    vap->va_fsid = mp->mnt_stat.f_fsid.val[0];
-    vap->va_fileid = fat->ino;
-    vap->va_mode = fat->mode & ~S_IFMT;
-    vap->va_nlink     = fat->nlink;
-    vap->va_uid       = fat->uid;
-    vap->va_gid       = fat->gid;
-    vap->va_rdev      = fat->rdev;
-    vap->va_size      = fat->size;
-    vap->va_atime.tv_sec  = fat->atime; /* XXX on some platforms cast from 64 bits to 32 */
-    vap->va_atime.tv_nsec = fat->atimensec;
-    vap->va_mtime.tv_sec  = fat->mtime;
-    vap->va_mtime.tv_nsec = fat->mtimensec;
-    vap->va_ctime.tv_sec  = fat->ctime;
-    vap->va_ctime.tv_nsec = fat->ctimensec;
-    vap->va_blocksize = PAGE_SIZE;
-    vap->va_type = IFTOVT(fat->mode);
-    vap->va_bytes = fat->blocks * S_BLKSIZE;
-    vap->va_flags = 0;
-
-    if (vap != vp_cache_at && vp_cache_at != NULL)
-        memcpy(vp_cache_at, vap, sizeof(*vap));
+	struct mount *mp;
+	struct fuse_vnode_data *fvdat;
+	struct vattr *vp_cache_at;
+
+	mp = vnode_mount(vp);
+	fvdat = VTOFUD(vp);
+
+	DEBUGX(FUSE_DEBUG_INTERNAL, "node #%ju, mode 0%o\n",
+	    (uintmax_t)fat->ino, fat->mode);
+
+	/* Honor explicit do-not-cache requests from user filesystems. */
+	if (attr_valid == 0 && attr_valid_nsec == 0)
+		fvdat->valid_attr_cache = false;
+	else
+		fvdat->valid_attr_cache = true;
+
+	vp_cache_at = VTOVA(vp);
+
+	if (vap == NULL && vp_cache_at == NULL)
+		return;
+
+	if (vap == NULL)
+		vap = vp_cache_at;
+
+	vattr_null(vap);
+
+	vap->va_fsid = mp->mnt_stat.f_fsid.val[0];
+	vap->va_fileid = fat->ino;
+	vap->va_mode = fat->mode & ~S_IFMT;
+	vap->va_nlink     = fat->nlink;
+	vap->va_uid       = fat->uid;
+	vap->va_gid       = fat->gid;
+	vap->va_rdev      = fat->rdev;
+	vap->va_size      = fat->size;
+	/* XXX on i386, seconds are truncated to 32 bits */
+	vap->va_atime.tv_sec  = fat->atime;
+	vap->va_atime.tv_nsec = fat->atimensec;
+	vap->va_mtime.tv_sec  = fat->mtime;
+	vap->va_mtime.tv_nsec = fat->mtimensec;
+	vap->va_ctime.tv_sec  = fat->ctime;
+	vap->va_ctime.tv_nsec = fat->ctimensec;
+	vap->va_blocksize = PAGE_SIZE;
+	vap->va_type = IFTOVT(fat->mode);
+	vap->va_bytes = fat->blocks * S_BLKSIZE;
+	vap->va_flags = 0;
+
+	if (vap != vp_cache_at && vp_cache_at != NULL)
+		memcpy(vp_cache_at, vap, sizeof(*vap));
 }
 
 
 #define	cache_attrs(vp, fuse_out, vap_out)				\
-        fuse_internal_attr_fat2vat((vp), &(fuse_out)->attr,		\
-            (fuse_out)->attr_valid, (fuse_out)->attr_valid_nsec, (vap_out))
+	fuse_internal_attr_fat2vat((vp), &(fuse_out)->attr,		\
+	    (fuse_out)->attr_valid, (fuse_out)->attr_valid_nsec, (vap_out))
 
 /* fsync */
 
-int
-fuse_internal_fsync(struct vnode           *vp,
-                    struct thread          *td,
-                    struct ucred           *cred,
-                    struct fuse_filehandle *fufh);
-
-int
-fuse_internal_fsync_callback(struct fuse_ticket *tick, struct uio *uio);
+int fuse_internal_fsync(struct vnode *vp, struct thread *td,
+    struct ucred *cred, struct fuse_filehandle *fufh);
+int fuse_internal_fsync_callback(struct fuse_ticket *tick, struct uio *uio);
 
 /* readdir */
 
 struct pseudo_dirent {
-    uint32_t d_namlen;
+	uint32_t d_namlen;
 };
 
-int
-fuse_internal_readdir(struct vnode           *vp,
-                      struct uio             *uio,
-                      struct fuse_filehandle *fufh,
-                      struct fuse_iov        *cookediov);
-
-int
-fuse_internal_readdir_processdata(struct uio *uio,
-                                  size_t reqsize,
-                                  void *buf,
-                                  size_t bufsize,
-                                  void *param);
+int fuse_internal_readdir(struct vnode *vp, struct uio *uio,
+    struct fuse_filehandle *fufh, struct fuse_iov *cookediov);
+int fuse_internal_readdir_processdata(struct uio *uio, size_t reqsize,
+    void *buf, size_t bufsize, void *param);
 
 /* remove */
 
-int
-fuse_internal_remove(struct vnode *dvp,
-                     struct vnode *vp,
-                     struct componentname *cnp,
-                     enum fuse_opcode op);
+int fuse_internal_remove(struct vnode *dvp, struct vnode *vp,
+    struct componentname *cnp, enum fuse_opcode op);
 
 /* rename */
 
-int
-fuse_internal_rename(struct vnode *fdvp,
-                     struct componentname *fcnp,
-                     struct vnode *tdvp,
-                     struct componentname *tcnp);
+int fuse_internal_rename(struct vnode *fdvp, struct componentname *fcnp,
+    struct vnode *tdvp, struct componentname *tcnp);
+
 /* revoke */
 
-void
-fuse_internal_vnode_disappear(struct vnode *vp);
+void fuse_internal_vnode_disappear(struct vnode *vp);
 
 /* strategy */
 
 /* entity creation */
 
-static __inline
-int
+static inline int
 fuse_internal_checkentry(struct fuse_entry_out *feo, enum vtype vtyp)
 {
-    DEBUGX(FUSE_DEBUG_INTERNAL,
-        "feo=%p, vtype=%d\n", feo, vtyp);
-
-    if (vtyp != IFTOVT(feo->attr.mode)) {
-        DEBUGX(FUSE_DEBUG_INTERNAL,
-            "EINVAL -- %x != %x\n", vtyp, IFTOVT(feo->attr.mode));
-        return EINVAL;
-    }
-
-    if (feo->nodeid == FUSE_NULL_ID) {
-        DEBUGX(FUSE_DEBUG_INTERNAL,
-            "EINVAL -- feo->nodeid is NULL\n");
-        return EINVAL;
-    }
-
-    if (feo->nodeid == FUSE_ROOT_ID) {
-        DEBUGX(FUSE_DEBUG_INTERNAL,
-            "EINVAL -- feo->nodeid is FUSE_ROOT_ID\n");
-        return EINVAL;
-    }
-
-    return 0;
+	DEBUGX(FUSE_DEBUG_INTERNAL,
+	    "feo=%p, vtype=%d\n", feo, vtyp);
+
+	if (vtyp != IFTOVT(feo->attr.mode)) {
+		DEBUGX(FUSE_DEBUG_INTERNAL,
+		    "EINVAL -- %x != %x\n", vtyp, IFTOVT(feo->attr.mode));
+		return (EINVAL);
+	}
+
+	if (feo->nodeid == FUSE_NULL_ID) {
+		DEBUGX(FUSE_DEBUG_INTERNAL,
+		    "EINVAL -- feo->nodeid is NULL\n");
+		return (EINVAL);
+	}
+
+	if (feo->nodeid == FUSE_ROOT_ID) {
+		DEBUGX(FUSE_DEBUG_INTERNAL,
+		    "EINVAL -- feo->nodeid is FUSE_ROOT_ID\n");
+		return (EINVAL);
+	}
+
+	return (0);
 }
 
-int
-fuse_internal_newentry(struct vnode *dvp,
-                       struct vnode **vpp,
-                       struct componentname *cnp,
-                       enum fuse_opcode op,
-                       void *buf,
-                       size_t bufsize,
-                       enum vtype vtyp);
-
-void
-fuse_internal_newentry_makerequest(struct mount *mp,
-                                   uint64_t dnid,
-                                   struct componentname *cnp,
-                                   enum fuse_opcode op,
-                                   void *buf,
-                                   size_t bufsize,
-                                   struct fuse_dispatcher *fdip);
-
-int
-fuse_internal_newentry_core(struct vnode *dvp,
-                            struct vnode **vpp,
-                            struct componentname   *cnp,
-                            enum vtype vtyp,
-                            struct fuse_dispatcher *fdip);
+int fuse_internal_newentry(struct vnode *dvp, struct vnode **vpp,
+    struct componentname *cnp, enum fuse_opcode op, void *buf, size_t bufsize,
+    enum vtype vtyp);
 
-/* entity destruction */
+void fuse_internal_newentry_makerequest(struct mount *mp, uint64_t dnid,
+    struct componentname *cnp, enum fuse_opcode op, void *buf, size_t bufsize,
+    struct fuse_dispatcher *fdip);
+
+int fuse_internal_newentry_core(struct vnode *dvp, struct vnode **vpp,
+    struct componentname *cnp, enum vtype vtyp, struct fuse_dispatcher *fdip);
 
-int
-fuse_internal_forget_callback(struct fuse_ticket *tick, struct uio *uio);
+/* entity destruction */
 
-void
-fuse_internal_forget_send(struct mount *mp,
-                          struct thread *td,
-                          struct ucred *cred,
-                          uint64_t nodeid,
-                          uint64_t nlookup);
+int fuse_internal_forget_callback(struct fuse_ticket *tick, struct uio *uio);
+void fuse_internal_forget_send(struct mount *mp, struct thread *td,
+    struct ucred *cred, uint64_t nodeid, uint64_t nlookup);
 
 /* fuse start/stop */