Commit 48c068e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
parents 7366935a b835bebe
...@@ -82,7 +82,6 @@ static int construct_dentry(struct qstr *qstring, struct file *file, ...@@ -82,7 +82,6 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
if(*ptmp_inode == NULL) if(*ptmp_inode == NULL)
return rc; return rc;
rc = 1; rc = 1;
d_instantiate(tmp_dentry, *ptmp_inode);
} }
} else { } else {
tmp_dentry = d_alloc(file->f_dentry, qstring); tmp_dentry = d_alloc(file->f_dentry, qstring);
...@@ -99,9 +98,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file, ...@@ -99,9 +98,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
tmp_dentry->d_op = &cifs_dentry_ops; tmp_dentry->d_op = &cifs_dentry_ops;
if(*ptmp_inode == NULL) if(*ptmp_inode == NULL)
return rc; return rc;
rc = 1; rc = 2;
d_instantiate(tmp_dentry, *ptmp_inode);
d_rehash(tmp_dentry);
} }
tmp_dentry->d_time = jiffies; tmp_dentry->d_time = jiffies;
...@@ -870,6 +867,12 @@ static int cifs_filldir(char *pfindEntry, struct file *file, ...@@ -870,6 +867,12 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
pfindEntry, &obj_type, rc); pfindEntry, &obj_type, rc);
else else
fill_in_inode(tmp_inode, 1 /* NT */, pfindEntry, &obj_type, rc); fill_in_inode(tmp_inode, 1 /* NT */, pfindEntry, &obj_type, rc);
if(rc) /* new inode - needs to be tied to dentry */ {
d_instantiate(tmp_dentry, tmp_inode);
if(rc == 2)
d_rehash(tmp_dentry);
}
rc = filldir(direntry,qstring.name,qstring.len,file->f_pos, rc = filldir(direntry,qstring.name,qstring.len,file->f_pos,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment