diff --git a/fuseops/ops.go b/fuseops/ops.go index 6d4a1af..a337710 100644 --- a/fuseops/ops.go +++ b/fuseops/ops.go @@ -27,7 +27,7 @@ import ( // Sent once when mounting the file system. It must succeed in order for the // mount to succeed. type InitOp struct { - Header RequestHeader + Header OpHeader } //////////////////////////////////////////////////////////////////////// @@ -37,7 +37,7 @@ type InitOp struct { // Look up a child by name within a parent directory. The kernel sends this // when resolving user paths to dentry structs, which are then cached. type LookUpInodeOp struct { - Header RequestHeader + Header OpHeader // The ID of the directory inode to which the child belongs. Parent InodeID @@ -62,7 +62,7 @@ type LookUpInodeOp struct { // inode attributes is stale. This is controlled by the AttributesExpiration // field of ChildInodeEntry, etc. type GetInodeAttributesOp struct { - Header RequestHeader + Header OpHeader // The inode of interest. Inode InodeID @@ -79,7 +79,7 @@ type GetInodeAttributesOp struct { // The kernel sends this for obvious cases like chmod(2), and for less obvious // cases like ftrunctate(2). type SetInodeAttributesOp struct { - Header RequestHeader + Header OpHeader // The inode of interest. Inode InodeID @@ -100,7 +100,7 @@ type SetInodeAttributesOp struct { // Forget an inode ID previously issued (e.g. by LookUpInode or MkDir). The // kernel sends this when removing an inode from its internal caches. type ForgetInodeOp struct { - Header RequestHeader + Header OpHeader // The inode to be forgotten. The kernel guarantees that the node ID will not // be used in further calls to the file system (unless it is reissued by the @@ -120,7 +120,7 @@ type ForgetInodeOp struct { // http://goo.gl/FZpLu5). But volatile file systems and paranoid non-volatile // file systems should check for the reasons described below on CreateFile. type MkDirOp struct { - Header RequestHeader + Header OpHeader // The ID of parent directory inode within which to create the child. Parent InodeID @@ -147,7 +147,7 @@ type MkDirOp struct { // course particularly applies to file systems that are volatile from the // kernel's point of view. type CreateFileOp struct { - Header RequestHeader + Header OpHeader // The ID of parent directory inode within which to create the child file. Parent InodeID @@ -185,7 +185,7 @@ type CreateFileOp struct { // // Sample implementation in ext2: ext2_rmdir (http://goo.gl/B9QmFf) type RmDirOp struct { - Header RequestHeader + Header OpHeader // The ID of parent directory inode, and the name of the directory being // removed within it. @@ -199,7 +199,7 @@ type RmDirOp struct { // // Sample implementation in ext2: ext2_unlink (http://goo.gl/hY6r6C) type UnlinkOp struct { - Header RequestHeader + Header OpHeader // The ID of parent directory inode, and the name of the file being removed // within it. @@ -218,7 +218,7 @@ type UnlinkOp struct { // user-space process. On OS X it may not be sent for every open(2) (cf. // https://github.com/osxfuse/osxfuse/issues/199). type OpenDirOp struct { - Header RequestHeader + Header OpHeader // The ID of the inode to be opened. Inode InodeID @@ -239,7 +239,7 @@ type OpenDirOp struct { // Read entries from a directory previously opened with OpenDir. type ReadDirOp struct { - Header RequestHeader + Header OpHeader // The directory inode that we are reading, and the handle previously // returned by OpenDir when opening that inode. @@ -334,7 +334,7 @@ type ReadDirOp struct { // The kernel guarantees that the handle ID will not be used in further ops // sent to the file system (unless it is reissued by the file system). type ReleaseDirHandleOp struct { - Header RequestHeader + Header OpHeader // The handle ID to be released. The kernel guarantees that this ID will not // be used in further calls to the file system (unless it is reissued by the @@ -353,7 +353,7 @@ type ReleaseDirHandleOp struct { // process. On OS X it may not be sent for every open(2) // (cf.https://github.com/osxfuse/osxfuse/issues/199). type OpenFileOp struct { - Header RequestHeader + Header OpHeader // The ID of the inode to be opened. Inode InodeID @@ -377,7 +377,7 @@ type OpenFileOp struct { // some reads may be served by the page cache. See notes on WriteFileOp for // more. type ReadFileOp struct { - Header RequestHeader + Header OpHeader // The file inode that we are reading, and the handle previously returned by // CreateFile or OpenFile when opening that inode. @@ -429,7 +429,7 @@ type ReadFileOp struct { // flush request. // type WriteFileOp struct { - Header RequestHeader + Header OpHeader // The file inode that we are modifying, and the handle previously returned // by CreateFile or OpenFile when opening that inode. @@ -484,7 +484,7 @@ type WriteFileOp struct { // See also: FlushFileOp, which may perform a similar function when closing a // file (but which is not used in "real" file systems). type SyncFileOp struct { - Header RequestHeader + Header OpHeader // The file and handle being sync'd. Inode InodeID @@ -539,7 +539,7 @@ type SyncFileOp struct { // to at least schedule a real flush, and maybe do it immediately in order to // return any errors that occur. type FlushFileOp struct { - Header RequestHeader + Header OpHeader // The file and handle being flushed. Inode InodeID @@ -553,7 +553,7 @@ type FlushFileOp struct { // The kernel guarantees that the handle ID will not be used in further calls // to the file system (unless it is reissued by the file system). type ReleaseFileHandleOp struct { - Header RequestHeader + Header OpHeader // The handle ID to be released. The kernel guarantees that this ID will not // be used in further calls to the file system (unless it is reissued by the diff --git a/fuseops/simple_types.go b/fuseops/simple_types.go index ae9260f..d56e964 100644 --- a/fuseops/simple_types.go +++ b/fuseops/simple_types.go @@ -126,7 +126,7 @@ type HandleID uint64 type DirOffset uint64 // A header that is included with every op. -type Header struct { +type OpHeader struct { // Credentials information for the process making the request. Uid uint32 Gid uint32