Merge remote branch 'origin/master' into tip

unionfs/unionfs.go

@@ -168,11 +168,8 @@ func (me *UnionFs) getBranchAttrNoCache(name string) branchResult {
 
 		a, s := fs.GetAttr(name)
 		if s.Ok() {
-			if a.Mode&fuse.S_IFDIR != 0 {
-				// Make all directories appear writable
-				a.Mode |= 0200
-			}
-
+			// Make all files appear writable
+			a.Mode |= 0222
 			return branchResult{
 				attr:   a,
 				code:   s,
@@ -356,7 +353,9 @@ func (me *UnionFs) Truncate(path string, offset uint64) (code fuse.Status) {
 	}
 	if code.Ok() {
 		r.attr.Size = int64(offset)
-		r.attr.Mtime_ns = time.Nanoseconds()
+		now := time.Nanoseconds()
+		r.attr.Mtime_ns = now
+		r.attr.Ctime_ns = now
 		me.branchCache.Set(path, r)
 	}
 	return code
@@ -377,6 +376,7 @@ func (me *UnionFs) Utimens(name string, atime uint64, mtime uint64) (code fuse.S
 	if code.Ok() {
 		r.attr.Atime_ns = int64(atime)
 		r.attr.Mtime_ns = int64(mtime)
+		r.attr.Ctime_ns = time.Nanoseconds()
 		me.branchCache.Set(name, r)
 	}
 	return code
@@ -537,8 +537,11 @@ func (me *UnionFs) Create(name string, flags uint32, mode uint32) (fuseFile fuse
 	if code.Ok() {
 		me.removeDeletion(name)
 
+		now := time.Nanoseconds()
 		a := os.FileInfo{
 		Mode: fuse.S_IFREG | mode,
+		Ctime_ns: now,
+		Mtime_ns: now,
 		}
 		me.branchCache.Set(name, branchResult{&a, fuse.OK, 0})
 	}