Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59548503 authored Apr 23, 2017 by Amir Goldstein Committed by Miklos Szeredi May 05, 2017

ovl: set the ORIGIN type flag



For directory entries, non zero oe->numlower implies OVL_TYPE_MERGE.
Define a new type flag OVL_TYPE_ORIGIN to indicate that an entry holds a
reference to its lower copy up origin.

For directory entries ORIGIN := MERGE && UPPER. For non-dir entries ORIGIN
means that a lower type dentry has been recently copied up or that we were
able to find the copy up origin from overlay.origin xattr.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

parent a9d01957

fs/overlayfs/overlayfs.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -13,10 +13,12 @@
		enum ovl_path_type {
		__OVL_PATH_UPPER = (1 << 0),
		__OVL_PATH_MERGE = (1 << 1),
		__OVL_PATH_ORIGIN = (1 << 2),
		};

		#define OVL_TYPE_UPPER(type) ((type) & __OVL_PATH_UPPER)
		#define OVL_TYPE_MERGE(type) ((type) & __OVL_PATH_MERGE)
		#define OVL_TYPE_ORIGIN(type) ((type) & __OVL_PATH_ORIGIN)

		#define OVL_XATTR_PREFIX XATTR_TRUSTED_PREFIX "overlay."
		#define OVL_XATTR_OPAQUE OVL_XATTR_PREFIX "opaque"

fs/overlayfs/util.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -83,11 +83,13 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)
		type = __OVL_PATH_UPPER;

		/*
		* Non-dir dentry can hold lower dentry from previous
		* location.
		* Non-dir dentry can hold lower dentry of its copy up origin.
		*/
		if (oe->numlower && d_is_dir(dentry))
		if (oe->numlower) {
		type \|= __OVL_PATH_ORIGIN;
		if (d_is_dir(dentry))
		type \|= __OVL_PATH_MERGE;
		}
		} else {
		if (oe->numlower > 1)
		type \|= __OVL_PATH_MERGE;