diff options
Diffstat (limited to 'fs/jffs2/dir.c')
-rw-r--r-- | fs/jffs2/dir.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index 05f73328b28b..4bca6a2e5c07 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c | |||
@@ -75,7 +75,6 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target, | |||
75 | struct nameidata *nd) | 75 | struct nameidata *nd) |
76 | { | 76 | { |
77 | struct jffs2_inode_info *dir_f; | 77 | struct jffs2_inode_info *dir_f; |
78 | struct jffs2_sb_info *c; | ||
79 | struct jffs2_full_dirent *fd = NULL, *fd_list; | 78 | struct jffs2_full_dirent *fd = NULL, *fd_list; |
80 | uint32_t ino = 0; | 79 | uint32_t ino = 0; |
81 | struct inode *inode = NULL; | 80 | struct inode *inode = NULL; |
@@ -86,7 +85,6 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target, | |||
86 | return ERR_PTR(-ENAMETOOLONG); | 85 | return ERR_PTR(-ENAMETOOLONG); |
87 | 86 | ||
88 | dir_f = JFFS2_INODE_INFO(dir_i); | 87 | dir_f = JFFS2_INODE_INFO(dir_i); |
89 | c = JFFS2_SB_INFO(dir_i->i_sb); | ||
90 | 88 | ||
91 | mutex_lock(&dir_f->sem); | 89 | mutex_lock(&dir_f->sem); |
92 | 90 | ||
@@ -119,7 +117,6 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target, | |||
119 | static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) | 117 | static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) |
120 | { | 118 | { |
121 | struct jffs2_inode_info *f; | 119 | struct jffs2_inode_info *f; |
122 | struct jffs2_sb_info *c; | ||
123 | struct inode *inode = filp->f_path.dentry->d_inode; | 120 | struct inode *inode = filp->f_path.dentry->d_inode; |
124 | struct jffs2_full_dirent *fd; | 121 | struct jffs2_full_dirent *fd; |
125 | unsigned long offset, curofs; | 122 | unsigned long offset, curofs; |
@@ -127,7 +124,6 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
127 | D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_path.dentry->d_inode->i_ino)); | 124 | D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_path.dentry->d_inode->i_ino)); |
128 | 125 | ||
129 | f = JFFS2_INODE_INFO(inode); | 126 | f = JFFS2_INODE_INFO(inode); |
130 | c = JFFS2_SB_INFO(inode->i_sb); | ||
131 | 127 | ||
132 | offset = filp->f_pos; | 128 | offset = filp->f_pos; |
133 | 129 | ||
@@ -609,8 +605,6 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry) | |||
609 | int ret; | 605 | int ret; |
610 | uint32_t now = get_seconds(); | 606 | uint32_t now = get_seconds(); |
611 | 607 | ||
612 | dentry_unhash(dentry); | ||
613 | |||
614 | for (fd = f->dents ; fd; fd = fd->next) { | 608 | for (fd = f->dents ; fd; fd = fd->next) { |
615 | if (fd->ino) | 609 | if (fd->ino) |
616 | return -ENOTEMPTY; | 610 | return -ENOTEMPTY; |
@@ -786,9 +780,6 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry, | |||
786 | uint8_t type; | 780 | uint8_t type; |
787 | uint32_t now; | 781 | uint32_t now; |
788 | 782 | ||
789 | if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) | ||
790 | dentry_unhash(new_dentry); | ||
791 | |||
792 | /* The VFS will check for us and prevent trying to rename a | 783 | /* The VFS will check for us and prevent trying to rename a |
793 | * file over a directory and vice versa, but if it's a directory, | 784 | * file over a directory and vice versa, but if it's a directory, |
794 | * the VFS can't check whether the victim is empty. The filesystem | 785 | * the VFS can't check whether the victim is empty. The filesystem |