diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-02-22 17:48:19 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-02-22 17:48:19 -0500 |
commit | 6b719e53099f1bf1cd32dd1d6704c101a7506c46 (patch) | |
tree | b1b888c5b11ed54da0ac7d8709f7731e0bdae0f9 /fs/ecryptfs | |
parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) |
ecryptfs_lookup(): use lookup_one_len_unlocked()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r-- | fs/ecryptfs/inode.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 4e685ac1024d..34bbf5d93f57 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
@@ -397,11 +397,9 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode, | |||
397 | int rc = 0; | 397 | int rc = 0; |
398 | 398 | ||
399 | lower_dir_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry->d_parent); | 399 | lower_dir_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry->d_parent); |
400 | inode_lock(d_inode(lower_dir_dentry)); | 400 | lower_dentry = lookup_one_len_unlocked(ecryptfs_dentry->d_name.name, |
401 | lower_dentry = lookup_one_len(ecryptfs_dentry->d_name.name, | ||
402 | lower_dir_dentry, | 401 | lower_dir_dentry, |
403 | ecryptfs_dentry->d_name.len); | 402 | ecryptfs_dentry->d_name.len); |
404 | inode_unlock(d_inode(lower_dir_dentry)); | ||
405 | if (IS_ERR(lower_dentry)) { | 403 | if (IS_ERR(lower_dentry)) { |
406 | rc = PTR_ERR(lower_dentry); | 404 | rc = PTR_ERR(lower_dentry); |
407 | ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned " | 405 | ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned " |
@@ -426,11 +424,9 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode, | |||
426 | "filename; rc = [%d]\n", __func__, rc); | 424 | "filename; rc = [%d]\n", __func__, rc); |
427 | goto out; | 425 | goto out; |
428 | } | 426 | } |
429 | inode_lock(d_inode(lower_dir_dentry)); | 427 | lower_dentry = lookup_one_len_unlocked(encrypted_and_encoded_name, |
430 | lower_dentry = lookup_one_len(encrypted_and_encoded_name, | ||
431 | lower_dir_dentry, | 428 | lower_dir_dentry, |
432 | encrypted_and_encoded_name_size); | 429 | encrypted_and_encoded_name_size); |
433 | inode_unlock(d_inode(lower_dir_dentry)); | ||
434 | if (IS_ERR(lower_dentry)) { | 430 | if (IS_ERR(lower_dentry)) { |
435 | rc = PTR_ERR(lower_dentry); | 431 | rc = PTR_ERR(lower_dentry); |
436 | ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned " | 432 | ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned " |