diff options
Diffstat (limited to 'pkg/p9')
| -rw-r--r-- | pkg/p9/client_file.go | 14 | ||||
| -rw-r--r-- | pkg/p9/file.go | 2 | ||||
| -rw-r--r-- | pkg/p9/handlers.go | 2 | ||||
| -rw-r--r-- | pkg/p9/local_server/local_server.go | 2 | ||||
| -rw-r--r-- | pkg/p9/messages.go | 10 | ||||
| -rw-r--r-- | pkg/p9/messages_test.go | 24 |
6 files changed, 27 insertions, 27 deletions
diff --git a/pkg/p9/client_file.go b/pkg/p9/client_file.go index 471c3a80b..258080f67 100644 --- a/pkg/p9/client_file.go +++ b/pkg/p9/client_file.go @@ -533,18 +533,18 @@ func (c *clientFile) Link(target File, newname string) error { } // Mknod implements File.Mknod. -func (c *clientFile) Mknod(name string, permissions FileMode, major uint32, minor uint32, uid UID, gid GID) (QID, error) { +func (c *clientFile) Mknod(name string, mode FileMode, major uint32, minor uint32, uid UID, gid GID) (QID, error) { if atomic.LoadUint32(&c.closed) != 0 { return QID{}, syscall.EBADF } msg := Tmknod{ - Directory: c.fid, - Name: name, - Permissions: permissions, - Major: major, - Minor: minor, - GID: NoGID, + Directory: c.fid, + Name: name, + Mode: mode, + Major: major, + Minor: minor, + GID: NoGID, } if versionSupportsTucreation(c.client.version) { diff --git a/pkg/p9/file.go b/pkg/p9/file.go index 89e814d50..a456e8b3d 100644 --- a/pkg/p9/file.go +++ b/pkg/p9/file.go @@ -170,7 +170,7 @@ type File interface { // Mknod makes a new device node. // // On the server, Mknod has a write concurrency guarantee. - Mknod(name string, permissions FileMode, major uint32, minor uint32, uid UID, gid GID) (QID, error) + Mknod(name string, mode FileMode, major uint32, minor uint32, uid UID, gid GID) (QID, error) // Rename renames the file. // diff --git a/pkg/p9/handlers.go b/pkg/p9/handlers.go index 533ead98a..f32368763 100644 --- a/pkg/p9/handlers.go +++ b/pkg/p9/handlers.go @@ -768,7 +768,7 @@ func (t *Tmknod) do(cs *connState, uid UID) (*Rmknod, error) { } // Do the mknod. - qid, err = ref.file.Mknod(t.Name, t.Permissions, t.Major, t.Minor, uid, t.GID) + qid, err = ref.file.Mknod(t.Name, t.Mode, t.Major, t.Minor, uid, t.GID) return err }); err != nil { return nil, err diff --git a/pkg/p9/local_server/local_server.go b/pkg/p9/local_server/local_server.go index d49d94550..9546b3de5 100644 --- a/pkg/p9/local_server/local_server.go +++ b/pkg/p9/local_server/local_server.go @@ -252,7 +252,7 @@ func (l *local) Link(target p9.File, newname string) error { // Mknod implements p9.File.Mknod. // // Not implemented. -func (l *local) Mknod(name string, permissions p9.FileMode, major uint32, minor uint32, _ p9.UID, _ p9.GID) (p9.QID, error) { +func (l *local) Mknod(name string, mode p9.FileMode, major uint32, minor uint32, _ p9.UID, _ p9.GID) (p9.QID, error) { return p9.QID{}, syscall.ENOSYS } diff --git a/pkg/p9/messages.go b/pkg/p9/messages.go index 703753c31..75d6bc832 100644 --- a/pkg/p9/messages.go +++ b/pkg/p9/messages.go @@ -1163,8 +1163,8 @@ type Tmknod struct { // Name is the device name. Name string - // Permissions are the device permissions. - Permissions FileMode + // Mode is the device mode and permissions. + Mode FileMode // Major is the device major number. Major uint32 @@ -1180,7 +1180,7 @@ type Tmknod struct { func (t *Tmknod) Decode(b *buffer) { t.Directory = b.ReadFID() t.Name = b.ReadString() - t.Permissions = b.ReadPermissions() + t.Mode = b.ReadFileMode() t.Major = b.Read32() t.Minor = b.Read32() t.GID = b.ReadGID() @@ -1190,7 +1190,7 @@ func (t *Tmknod) Decode(b *buffer) { func (t *Tmknod) Encode(b *buffer) { b.WriteFID(t.Directory) b.WriteString(t.Name) - b.WritePermissions(t.Permissions) + b.WriteFileMode(t.Mode) b.Write32(t.Major) b.Write32(t.Minor) b.WriteGID(t.GID) @@ -1203,7 +1203,7 @@ func (*Tmknod) Type() MsgType { // String implements fmt.Stringer. func (t *Tmknod) String() string { - return fmt.Sprintf("Tmknod{DirectoryFID: %d, Name: %s, Permissions: 0o%o, Major: %d, Minor: %d, GID: %d}", t.Directory, t.Name, t.Permissions, t.Major, t.Minor, t.GID) + return fmt.Sprintf("Tmknod{DirectoryFID: %d, Name: %s, Mode: 0o%o, Major: %d, Minor: %d, GID: %d}", t.Directory, t.Name, t.Mode, t.Major, t.Minor, t.GID) } // Rmknod is a mknod response. diff --git a/pkg/p9/messages_test.go b/pkg/p9/messages_test.go index 513b30e8b..6ba6a1654 100644 --- a/pkg/p9/messages_test.go +++ b/pkg/p9/messages_test.go @@ -142,12 +142,12 @@ func TestEncodeDecode(t *testing.T) { QID: QID{Type: 1}, }, &Tmknod{ - Directory: 1, - Name: "a", - Permissions: 2, - Major: 3, - Minor: 4, - GID: 5, + Directory: 1, + Name: "a", + Mode: 2, + Major: 3, + Minor: 4, + GID: 5, }, &Rmknod{ QID: QID{Type: 1}, @@ -349,12 +349,12 @@ func TestEncodeDecode(t *testing.T) { }, &Tumknod{ Tmknod: Tmknod{ - Directory: 1, - Name: "a", - Permissions: 2, - Major: 3, - Minor: 4, - GID: 5, + Directory: 1, + Name: "a", + Mode: 2, + Major: 3, + Minor: 4, + GID: 5, }, UID: 6, }, |