diff options
author | Matthew Wilcox <willy@linux.intel.com> | 2013-06-15 07:55:59 -0400 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2013-07-10 02:40:28 -0400 |
commit | cc18ec3c8f5dd735c1bff5da30fd33860c08a293 (patch) | |
tree | 50fdd52cf70d0b611a24f42226cdca8467be6f10 /fs/ecryptfs/file.c | |
parent | 0df5ed65c14e2c36ed842fcff58118662009f1a1 (diff) |
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>
Diffstat (limited to 'fs/ecryptfs/file.c')
-rw-r--r-- | fs/ecryptfs/file.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index a7abbea2c096..0943f6f20b1c 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c | |||
@@ -49,7 +49,7 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, | |||
49 | unsigned long nr_segs, loff_t pos) | 49 | unsigned long nr_segs, loff_t pos) |
50 | { | 50 | { |
51 | ssize_t rc; | 51 | ssize_t rc; |
52 | struct path lower; | 52 | struct path *path; |
53 | struct file *file = iocb->ki_filp; | 53 | struct file *file = iocb->ki_filp; |
54 | 54 | ||
55 | rc = generic_file_aio_read(iocb, iov, nr_segs, pos); | 55 | rc = generic_file_aio_read(iocb, iov, nr_segs, pos); |
@@ -60,9 +60,8 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, | |||
60 | if (-EIOCBQUEUED == rc) | 60 | if (-EIOCBQUEUED == rc) |
61 | rc = wait_on_sync_kiocb(iocb); | 61 | rc = wait_on_sync_kiocb(iocb); |
62 | if (rc >= 0) { | 62 | if (rc >= 0) { |
63 | lower.dentry = ecryptfs_dentry_to_lower(file->f_path.dentry); | 63 | path = ecryptfs_dentry_to_lower_path(file->f_path.dentry); |
64 | lower.mnt = ecryptfs_dentry_to_lower_mnt(file->f_path.dentry); | 64 | touch_atime(path); |
65 | touch_atime(&lower); | ||
66 | } | 65 | } |
67 | return rc; | 66 | return rc; |
68 | } | 67 | } |