Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuse: readdirplus: fix instantiate

Browse Source 
Fuse does instantiation slightly differently from NFS/CIFS which use
d_materialise_unique().

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: stable@vger.kernel.org
This commit is contained in:
Miklos Szeredi 2013-07-17 14:53:53 +02:00
parent a28ef45cbb
commit 2914941e31
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/fuse/dir.c
View File

@ -1272,10 +1272,19 @@ static int fuse_direntplus_link(struct file *file,
if (!inode) if (!inode)
goto out; goto out;
alias = d_materialise_unique(dentry, inode); if (S_ISDIR(inode->i_mode)) {
err = PTR_ERR(alias); mutex_lock(&fc->inst_mutex);
if (IS_ERR(alias)) alias = fuse_d_add_directory(dentry, inode);
goto out; mutex_unlock(&fc->inst_mutex);
err = PTR_ERR(alias);
if (IS_ERR(alias)) {
iput(inode);
goto out;
}
} else {
alias = d_splice_alias(inode, dentry);
}
if (alias) { if (alias) {
dput(dentry); dput(dentry);
dentry = alias; dentry = alias;