err := unix.Unlinkat(parentFd, baseName, 0)
if err != nil && !os.IsNotExist(err) {
err2 := unix.Unlinkat(parentFd, baseName,
- AT_REMOVEDIR)
+ unix.AT_REMOVEDIR)
if err2 != nil && !os.IsNotExist(err2) {
// See src/os/file_unix.go in Go's sources
if err2 == unix.ENOTDIR {
// the error when the user tries to access this
// directory (access for the group will fail though).
mode := change.Old.Mode & fs.ModePerm & 0700
+ // Retain setgid/sticky so that the behavior does not
+ // change when creating and removing files.
+ mode |= change.Old.Mode & fs.ModeSetgid
+ mode |= change.Old.Mode & fs.ModeSticky
debugf("chmodding %#o (temporary)", mode)
err := oldFh.Chmod(mode)
if err != nil {