mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-10 00:26:34 +00:00
[PATCH] eCryptfs: CIFS nlink fixes
When CIFS is the lower filesystem, the old lower dentry needs to be explicitly dropped from inside eCryptfs to force a revalidate. In addition, when CIFS is the lower filesystem, the inode attributes need to be copied back up from the lower inode to the eCryptfs inode on an eCryptfs revalidate. Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
31be830953
commit
ae56fb1633
2 changed files with 8 additions and 1 deletions
|
@ -470,6 +470,7 @@ out_lock:
|
|||
unlock_dir(lower_dir_dentry);
|
||||
dput(lower_new_dentry);
|
||||
dput(lower_old_dentry);
|
||||
d_drop(lower_old_dentry);
|
||||
d_drop(new_dentry);
|
||||
d_drop(old_dentry);
|
||||
return rc;
|
||||
|
@ -484,7 +485,7 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry)
|
|||
lock_parent(lower_dentry);
|
||||
rc = vfs_unlink(lower_dir_inode, lower_dentry);
|
||||
if (rc) {
|
||||
ecryptfs_printk(KERN_ERR, "Error in vfs_unlink\n");
|
||||
printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
|
||||
goto out_unlock;
|
||||
}
|
||||
ecryptfs_copy_attr_times(dir, lower_dir_inode);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue