diff options
Diffstat (limited to 'fs/jffs2/dir.c')
-rw-r--r-- | fs/jffs2/dir.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index b56018896d5..ad7774d3209 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c | |||
@@ -25,9 +25,9 @@ | |||
25 | static int jffs2_readdir (struct file *, void *, filldir_t); | 25 | static int jffs2_readdir (struct file *, void *, filldir_t); |
26 | 26 | ||
27 | static int jffs2_create (struct inode *,struct dentry *,umode_t, | 27 | static int jffs2_create (struct inode *,struct dentry *,umode_t, |
28 | struct nameidata *); | 28 | bool); |
29 | static struct dentry *jffs2_lookup (struct inode *,struct dentry *, | 29 | static struct dentry *jffs2_lookup (struct inode *,struct dentry *, |
30 | struct nameidata *); | 30 | unsigned int); |
31 | static int jffs2_link (struct dentry *,struct inode *,struct dentry *); | 31 | static int jffs2_link (struct dentry *,struct inode *,struct dentry *); |
32 | static int jffs2_unlink (struct inode *,struct dentry *); | 32 | static int jffs2_unlink (struct inode *,struct dentry *); |
33 | static int jffs2_symlink (struct inode *,struct dentry *,const char *); | 33 | static int jffs2_symlink (struct inode *,struct dentry *,const char *); |
@@ -74,7 +74,7 @@ const struct inode_operations jffs2_dir_inode_operations = | |||
74 | nice and simple | 74 | nice and simple |
75 | */ | 75 | */ |
76 | static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target, | 76 | static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target, |
77 | struct nameidata *nd) | 77 | unsigned int flags) |
78 | { | 78 | { |
79 | struct jffs2_inode_info *dir_f; | 79 | struct jffs2_inode_info *dir_f; |
80 | struct jffs2_full_dirent *fd = NULL, *fd_list; | 80 | struct jffs2_full_dirent *fd = NULL, *fd_list; |
@@ -175,7 +175,7 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
175 | 175 | ||
176 | 176 | ||
177 | static int jffs2_create(struct inode *dir_i, struct dentry *dentry, | 177 | static int jffs2_create(struct inode *dir_i, struct dentry *dentry, |
178 | umode_t mode, struct nameidata *nd) | 178 | umode_t mode, bool excl) |
179 | { | 179 | { |
180 | struct jffs2_raw_inode *ri; | 180 | struct jffs2_raw_inode *ri; |
181 | struct jffs2_inode_info *f, *dir_f; | 181 | struct jffs2_inode_info *f, *dir_f; |
@@ -226,8 +226,8 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry, | |||
226 | __func__, inode->i_ino, inode->i_mode, inode->i_nlink, | 226 | __func__, inode->i_ino, inode->i_mode, inode->i_nlink, |
227 | f->inocache->pino_nlink, inode->i_mapping->nrpages); | 227 | f->inocache->pino_nlink, inode->i_mapping->nrpages); |
228 | 228 | ||
229 | d_instantiate(dentry, inode); | ||
230 | unlock_new_inode(inode); | 229 | unlock_new_inode(inode); |
230 | d_instantiate(dentry, inode); | ||
231 | return 0; | 231 | return 0; |
232 | 232 | ||
233 | fail: | 233 | fail: |
@@ -446,8 +446,8 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char | |||
446 | mutex_unlock(&dir_f->sem); | 446 | mutex_unlock(&dir_f->sem); |
447 | jffs2_complete_reservation(c); | 447 | jffs2_complete_reservation(c); |
448 | 448 | ||
449 | d_instantiate(dentry, inode); | ||
450 | unlock_new_inode(inode); | 449 | unlock_new_inode(inode); |
450 | d_instantiate(dentry, inode); | ||
451 | return 0; | 451 | return 0; |
452 | 452 | ||
453 | fail: | 453 | fail: |
@@ -591,8 +591,8 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, umode_t mode | |||
591 | mutex_unlock(&dir_f->sem); | 591 | mutex_unlock(&dir_f->sem); |
592 | jffs2_complete_reservation(c); | 592 | jffs2_complete_reservation(c); |
593 | 593 | ||
594 | d_instantiate(dentry, inode); | ||
595 | unlock_new_inode(inode); | 594 | unlock_new_inode(inode); |
595 | d_instantiate(dentry, inode); | ||
596 | return 0; | 596 | return 0; |
597 | 597 | ||
598 | fail: | 598 | fail: |
@@ -766,8 +766,8 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, umode_t mode | |||
766 | mutex_unlock(&dir_f->sem); | 766 | mutex_unlock(&dir_f->sem); |
767 | jffs2_complete_reservation(c); | 767 | jffs2_complete_reservation(c); |
768 | 768 | ||
769 | d_instantiate(dentry, inode); | ||
770 | unlock_new_inode(inode); | 769 | unlock_new_inode(inode); |
770 | d_instantiate(dentry, inode); | ||
771 | return 0; | 771 | return 0; |
772 | 772 | ||
773 | fail: | 773 | fail: |