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

Commit 92dd1230 authored by Al Viro's avatar Al Viro
Browse files

ecryptfs: get rid of ecryptfs_set_dentry_lower{,_mnt} 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2edbfbf1

fs/ecryptfs/ecryptfs_kernel.h

+0 −14
Original line number Diff line number Diff line
@@ -515,13 +515,6 @@ ecryptfs_dentry_to_lower(struct dentry *dentry) 
	return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.dentry;

}



static inline void

ecryptfs_set_dentry_lower(struct dentry *dentry, struct dentry *lower_dentry)

{

	((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.dentry =

		lower_dentry;

}



static inline struct vfsmount *

ecryptfs_dentry_to_lower_mnt(struct dentry *dentry)

{
@@ -534,13 +527,6 @@ ecryptfs_dentry_to_lower_path(struct dentry *dentry) 
	return &((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path;

}



static inline void

ecryptfs_set_dentry_lower_mnt(struct dentry *dentry, struct vfsmount *lower_mnt)

{

	((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.mnt =

		lower_mnt;

}



#define ecryptfs_printk(type, fmt, arg...) \

        __ecryptfs_printk(type "%s: " fmt, __func__, ## arg);

__printf(1, 2)

fs/ecryptfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -361,8 +361,8 @@ static int ecryptfs_lookup_interpose(struct dentry *dentry, 
	BUG_ON(!d_count(lower_dentry));



	ecryptfs_set_dentry_private(dentry, dentry_info);

	ecryptfs_set_dentry_lower(dentry, lower_dentry);

	ecryptfs_set_dentry_lower_mnt(dentry, lower_mnt);

	dentry_info->lower_path.mnt = lower_mnt;

	dentry_info->lower_path.dentry = lower_dentry;



	if (!lower_dentry->d_inode) {

		/* We want to add because we couldn't find in lower */

fs/ecryptfs/main.c

+1 −2
Original line number Diff line number Diff line
@@ -585,8 +585,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags 


	/* ->kill_sb() will take care of root_info */

	ecryptfs_set_dentry_private(s->s_root, root_info);

	ecryptfs_set_dentry_lower(s->s_root, path.dentry);

	ecryptfs_set_dentry_lower_mnt(s->s_root, path.mnt);

	root_info->lower_path = path;



	s->s_flags |= MS_ACTIVE;

	return dget(s->s_root);