p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ecryptfs_dentry_to_lower_path in a couple of places 

There are two places in ecryptfs that benefit from using
ecryptfs_dentry_to_lower_path() instead of separate calls to
ecryptfs_dentry_to_lower() and ecryptfs_dentry_to_lower_mnt().  Both
sites use fewer instructions and less stack (determined by examining
objdump output).

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Matthew Wilcox 2013-06-15 07:55:59 -04:00 committed by Tyler Hicks
parent 0df5ed65c1
commit cc18ec3c8f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ecryptfs/file.c
View File

@ -49,7 +49,7 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
unsigned long nr_segs, loff_t pos) unsigned long nr_segs, loff_t pos)
{ {
ssize_t rc; ssize_t rc;
struct path lower; struct path *path;
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
rc = generic_file_aio_read(iocb, iov, nr_segs, pos); rc = generic_file_aio_read(iocb, iov, nr_segs, pos);
@ -60,9 +60,8 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
if (-EIOCBQUEUED == rc) if (-EIOCBQUEUED == rc)
rc = wait_on_sync_kiocb(iocb); rc = wait_on_sync_kiocb(iocb);
if (rc >= 0) { if (rc >= 0) {
lower.dentry = ecryptfs_dentry_to_lower(file->f_path.dentry); path = ecryptfs_dentry_to_lower_path(file->f_path.dentry);
lower.mnt = ecryptfs_dentry_to_lower_mnt(file->f_path.dentry); touch_atime(path);
touch_atime(&lower);
} }
return rc; return rc;
} }

7
fs/ecryptfs/main.c
View File

@ -120,16 +120,15 @@ static int ecryptfs_init_lower_file(struct dentry *dentry,
struct file **lower_file) struct file **lower_file)
{ {
const struct cred *cred = current_cred(); const struct cred *cred = current_cred();
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry); struct path *path = ecryptfs_dentry_to_lower_path(dentry);
struct vfsmount *lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
int rc; int rc;
rc = ecryptfs_privileged_open(lower_file, lower_dentry, lower_mnt, rc = ecryptfs_privileged_open(lower_file, path->dentry, path->mnt,
cred); cred);
if (rc) { if (rc) {
printk(KERN_ERR "Error opening lower file " printk(KERN_ERR "Error opening lower file "
"for lower_dentry [0x%p] and lower_mnt [0x%p]; " "for lower_dentry [0x%p] and lower_mnt [0x%p]; "
"rc = [%d]\n", lower_dentry, lower_mnt, rc); "rc = [%d]\n", path->dentry, path->mnt, rc);
(*lower_file) = NULL; (*lower_file) = NULL;
} }
return rc; return rc;