Skip to content

Commit 05ab819

Browse files
committed
Replace kernelFSID with unix.Fsid
1 parent a06014e commit 05ab819

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

fanotify_event.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,14 @@ type fanotifyEventInfoHeader struct {
2525
Len uint16
2626
}
2727

28-
type kernelFSID struct {
29-
val [2]int32
30-
}
31-
3228
// FanotifyEventInfoFID represents a unique file identifier info record.
3329
// This structure is used for records of types FAN_EVENT_INFO_TYPE_FID,
3430
// FAN_EVENT_INFO_TYPE_DFID and FAN_EVENT_INFO_TYPE_DFID_NAME.
3531
// For FAN_EVENT_INFO_TYPE_DFID_NAME there is additionally a null terminated
3632
// name immediately after the file handle.
3733
type fanotifyEventInfoFID struct {
3834
Header fanotifyEventInfoHeader
39-
fsid kernelFSID
35+
fsid unix.Fsid
4036
fileHandle byte
4137
}
4238

@@ -332,7 +328,7 @@ func getFileHandle(metadataLen uint16, buf []byte, i int) *unix.FileHandle {
332328
var fhType int32 // this is int handle_type; but Go uses int32
333329

334330
sizeOfFanotifyEventInfoHeader := uint32(unsafe.Sizeof(fanotifyEventInfoHeader{}))
335-
sizeOfKernelFSIDType := uint32(unsafe.Sizeof(kernelFSID{}))
331+
sizeOfKernelFSIDType := uint32(unsafe.Sizeof(unix.Fsid{}))
336332
sizeOfUint32 := uint32(unsafe.Sizeof(fhSize))
337333
j := uint32(i) + uint32(metadataLen) + sizeOfFanotifyEventInfoHeader + sizeOfKernelFSIDType
338334
binary.Read(bytes.NewReader(buf[j:j+sizeOfUint32]), binary.LittleEndian, &fhSize)
@@ -350,7 +346,7 @@ func getFileHandleWithName(metadataLen uint16, buf []byte, i int) (*unix.FileHan
350346
var nameBytes bytes.Buffer
351347

352348
sizeOfFanotifyEventInfoHeader := uint32(unsafe.Sizeof(fanotifyEventInfoHeader{}))
353-
sizeOfKernelFSIDType := uint32(unsafe.Sizeof(kernelFSID{}))
349+
sizeOfKernelFSIDType := uint32(unsafe.Sizeof(unix.Fsid{}))
354350
sizeOfUint32 := uint32(unsafe.Sizeof(fhSize))
355351
j := uint32(i) + uint32(metadataLen) + sizeOfFanotifyEventInfoHeader + sizeOfKernelFSIDType
356352
binary.Read(bytes.NewReader(buf[j:j+sizeOfUint32]), binary.LittleEndian, &fhSize)

0 commit comments

Comments
 (0)