lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ecryptfs: get rid of ecryptfs_set_dentry_lower{,_mnt}

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2013-09-15 20:50:13 -04:00
parent 2edbfbf1c1
commit 92dd123033
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/ecryptfs/ecryptfs_kernel.h
View File

@@ -515,13 +515,6 @@ ecryptfs_dentry_to_lower(struct dentry *dentry)
return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.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 * static inline struct vfsmount *
ecryptfs_dentry_to_lower_mnt(struct dentry *dentry) 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; 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...) \ #define ecryptfs_printk(type, fmt, arg...) \
__ecryptfs_printk(type "%s: " fmt, __func__, ## arg); __ecryptfs_printk(type "%s: " fmt, __func__, ## arg);
__printf(1, 2) __printf(1, 2)

4
fs/ecryptfs/inode.c
View File

@@ -361,8 +361,8 @@ static int ecryptfs_lookup_interpose(struct dentry *dentry,
BUG_ON(!d_count(lower_dentry)); BUG_ON(!d_count(lower_dentry));
ecryptfs_set_dentry_private(dentry, dentry_info); ecryptfs_set_dentry_private(dentry, dentry_info);
ecryptfs_set_dentry_lower(dentry, lower_dentry); dentry_info->lower_path.mnt = lower_mnt;
ecryptfs_set_dentry_lower_mnt(dentry, lower_mnt); dentry_info->lower_path.dentry = lower_dentry;
if (!lower_dentry->d_inode) { if (!lower_dentry->d_inode) {
/* We want to add because we couldn't find in lower */ /* We want to add because we couldn't find in lower */

3
fs/ecryptfs/main.c
View File

@@ -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 */ /* ->kill_sb() will take care of root_info */
ecryptfs_set_dentry_private(s->s_root, root_info); ecryptfs_set_dentry_private(s->s_root, root_info);
ecryptfs_set_dentry_lower(s->s_root, path.dentry); root_info->lower_path = path;
ecryptfs_set_dentry_lower_mnt(s->s_root, path.mnt);
s->s_flags |= MS_ACTIVE; s->s_flags |= MS_ACTIVE;
return dget(s->s_root); return dget(s->s_root);