Change merkle root file name to avoid collision

PiperOrigin-RevId: 346923826
This commit is contained in:
Chong Cai
2020-12-10 20:53:00 -08:00
committed by gVisor bot
parent bcb97a3bb7
commit e7279936e8
+5 -1
View File
@@ -64,6 +64,10 @@ const (
// tree file for "/foo" is "/.merkle.verity.foo".
merklePrefix = ".merkle.verity."
// merkleRootPrefix is the prefix of the Merkle tree root file. This
// needs to be different from merklePrefix to avoid name collision.
merkleRootPrefix = ".merkleroot.verity."
// merkleOffsetInParentXattr is the extended attribute name specifying the
// offset of the child hash in its parent's Merkle tree.
merkleOffsetInParentXattr = "user.merkle.offset"
@@ -255,7 +259,7 @@ func (fstype FilesystemType) GetFilesystem(ctx context.Context, vfsObj *vfs.Virt
lowerVD.IncRef()
d.lowerVD = lowerVD
rootMerkleName := merklePrefix + iopts.RootMerkleFileName
rootMerkleName := merkleRootPrefix + iopts.RootMerkleFileName
lowerMerkleVD, err := vfsObj.GetDentryAt(ctx, fs.creds, &vfs.PathOperation{
Root: lowerVD,