diff options
Diffstat (limited to 'fs/isofs/namei.c')
| -rw-r--r-- | fs/isofs/namei.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c index 68fa503d877..95295640d9c 100644 --- a/fs/isofs/namei.c +++ b/fs/isofs/namei.c @@ -37,8 +37,7 @@ isofs_cmp(struct dentry *dentry, const char *compare, int dlen) qstr.name = compare; qstr.len = dlen; - return dentry->d_op->d_compare(NULL, NULL, NULL, NULL, - dentry->d_name.len, dentry->d_name.name, &qstr); + return dentry->d_op->d_compare(NULL, NULL, dentry->d_name.len, dentry->d_name.name, &qstr); } /* @@ -163,12 +162,11 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry, return 0; } -struct dentry *isofs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) +struct dentry *isofs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) { int found; unsigned long uninitialized_var(block); unsigned long uninitialized_var(offset); - struct isofs_sb_info *sbi = ISOFS_SB(dir->i_sb); struct inode *inode; struct page *page; @@ -176,7 +174,6 @@ struct dentry *isofs_lookup(struct inode *dir, struct dentry *dentry, struct nam if (!page) return ERR_PTR(-ENOMEM); - mutex_lock(&sbi->s_mutex); found = isofs_find_entry(dir, dentry, &block, &offset, page_address(page), @@ -185,7 +182,5 @@ struct dentry *isofs_lookup(struct inode *dir, struct dentry *dentry, struct nam inode = found ? isofs_iget(dir->i_sb, block, offset) : NULL; - mutex_unlock(&sbi->s_mutex); - return d_splice_alias(inode, dentry); } |