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

Commit 647d253f authored by Vivek Goyal's avatar Vivek Goyal Committed by Miklos Szeredi
Browse files

ovl: Add helper ovl_dentry_lowerdata() to get lower data dentry 



Now we have the notion of data dentry and metacopy dentry.
ovl_dentry_lower() will return uppermost lower dentry, but it could be
either data or metacopy dentry.  Now we support metacopy dentries in lower
layers so it is possible that lowerstack[0] is metacopy dentry while
lowerstack[1] is actual data dentry.

So add an helper which returns lowest most dentry which is supposed to be
data dentry.

Signed-off-by: default avatarVivek Goyal <vgoyal@redhat.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 4f93b426

fs/overlayfs/overlayfs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,7 @@ void ovl_path_lowerdata(struct dentry *dentry, struct path *path); 
enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path);

enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path);

struct dentry *ovl_dentry_upper(struct dentry *dentry);

struct dentry *ovl_dentry_upper(struct dentry *dentry);

struct dentry *ovl_dentry_lower(struct dentry *dentry);

struct dentry *ovl_dentry_lower(struct dentry *dentry);

struct dentry *ovl_dentry_lowerdata(struct dentry *dentry);

struct ovl_layer *ovl_layer_lower(struct dentry *dentry);

struct ovl_layer *ovl_layer_lower(struct dentry *dentry);

struct dentry *ovl_dentry_real(struct dentry *dentry);

struct dentry *ovl_dentry_real(struct dentry *dentry);

struct dentry *ovl_i_dentry_upper(struct inode *inode);

struct dentry *ovl_i_dentry_upper(struct inode *inode);

fs/overlayfs/util.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -207,6 +207,19 @@ struct ovl_layer *ovl_layer_lower(struct dentry *dentry) 
	return oe->numlower ? oe->lowerstack[0].layer : NULL;

	return oe->numlower ? oe->lowerstack[0].layer : NULL;

}

}





/*

 * ovl_dentry_lower() could return either a data dentry or metacopy dentry

 * dependig on what is stored in lowerstack[0]. At times we need to find

 * lower dentry which has data (and not metacopy dentry). This helper

 * returns the lower data dentry.

 */

struct dentry *ovl_dentry_lowerdata(struct dentry *dentry)

{

	struct ovl_entry *oe = dentry->d_fsdata;



	return oe->numlower ? oe->lowerstack[oe->numlower - 1].dentry : NULL;

}



struct dentry *ovl_dentry_real(struct dentry *dentry)

struct dentry *ovl_dentry_real(struct dentry *dentry)

{

{

	return ovl_dentry_upper(dentry) ?: ovl_dentry_lower(dentry);

	return ovl_dentry_upper(dentry) ?: ovl_dentry_lower(dentry);