aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs/dir.c')
-rw-r--r--fs/cifs/dir.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 2e773825835e..1e95dd635632 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -130,17 +130,6 @@ cifs_bp_rename_retry:
130 return full_path; 130 return full_path;
131} 131}
132 132
133static void setup_cifs_dentry(struct cifsTconInfo *tcon,
134 struct dentry *direntry,
135 struct inode *newinode)
136{
137 if (tcon->nocase)
138 d_set_d_op(direntry, &cifs_ci_dentry_ops);
139 else
140 d_set_d_op(direntry, &cifs_dentry_ops);
141 d_instantiate(direntry, newinode);
142}
143
144/* Inode operations in similar order to how they appear in Linux file fs.h */ 133/* Inode operations in similar order to how they appear in Linux file fs.h */
145 134
146int 135int
@@ -327,7 +316,7 @@ cifs_create_get_file_info:
327 316
328cifs_create_set_dentry: 317cifs_create_set_dentry:
329 if (rc == 0) 318 if (rc == 0)
330 setup_cifs_dentry(tcon, direntry, newinode); 319 d_instantiate(direntry, newinode);
331 else 320 else
332 cFYI(1, "Create worked, get_inode_info failed rc = %d", rc); 321 cFYI(1, "Create worked, get_inode_info failed rc = %d", rc);
333 322
@@ -418,10 +407,6 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode,
418 407
419 rc = cifs_get_inode_info_unix(&newinode, full_path, 408 rc = cifs_get_inode_info_unix(&newinode, full_path,
420 inode->i_sb, xid); 409 inode->i_sb, xid);
421 if (pTcon->nocase)
422 d_set_d_op(direntry, &cifs_ci_dentry_ops);
423 else
424 d_set_d_op(direntry, &cifs_dentry_ops);
425 410
426 if (rc == 0) 411 if (rc == 0)
427 d_instantiate(direntry, newinode); 412 d_instantiate(direntry, newinode);
@@ -601,10 +586,6 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
601 parent_dir_inode->i_sb, xid, NULL); 586 parent_dir_inode->i_sb, xid, NULL);
602 587
603 if ((rc == 0) && (newInode != NULL)) { 588 if ((rc == 0) && (newInode != NULL)) {
604 if (pTcon->nocase)
605 d_set_d_op(direntry, &cifs_ci_dentry_ops);
606 else
607 d_set_d_op(direntry, &cifs_dentry_ops);
608 d_add(direntry, newInode); 589 d_add(direntry, newInode);
609 if (posix_open) { 590 if (posix_open) {
610 filp = lookup_instantiate_filp(nd, direntry, 591 filp = lookup_instantiate_filp(nd, direntry,
@@ -631,10 +612,6 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
631 } else if (rc == -ENOENT) { 612 } else if (rc == -ENOENT) {
632 rc = 0; 613 rc = 0;
633 direntry->d_time = jiffies; 614 direntry->d_time = jiffies;
634 if (pTcon->nocase)
635 d_set_d_op(direntry, &cifs_ci_dentry_ops);
636 else
637 d_set_d_op(direntry, &cifs_dentry_ops);
638 d_add(direntry, NULL); 615 d_add(direntry, NULL);
639 /* if it was once a directory (but how can we tell?) we could do 616 /* if it was once a directory (but how can we tell?) we could do
640 shrink_dcache_parent(direntry); */ 617 shrink_dcache_parent(direntry); */