diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-31 10:55:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-31 10:55:42 +1100 |
| commit | 46491588c6335cbc71ca660d9feb2c0d4f0f6401 (patch) | |
| tree | 7f650ddd7b6e934c63332b75b0cd598006a714a9 /fs/isofs/namei.c | |
| parent | d4a2c96152ed0290c0d6c7791f5315b2f01105ff (diff) | |
| parent | 6245d166245845e40bd290b0df1ae99a2d5bbf63 (diff) | |
Merge remote branch 'vfs-scale/vfs-scale-working'
Conflicts:
Documentation/filesystems/Locking
fs/cifs/dir.c
fs/fuse/inode.c
fs/hfsplus/hfsplus_fs.h
fs/hfsplus/unicode.c
Diffstat (limited to 'fs/isofs/namei.c')
| -rw-r--r-- | fs/isofs/namei.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c index 0d23abfd4280..679a849c3b27 100644 --- a/fs/isofs/namei.c +++ b/fs/isofs/namei.c @@ -37,7 +37,8 @@ isofs_cmp(struct dentry *dentry, const char *compare, int dlen) qstr.name = compare; qstr.len = dlen; - return dentry->d_op->d_compare(dentry, &dentry->d_name, &qstr); + return dentry->d_op->d_compare(NULL, NULL, NULL, NULL, + dentry->d_name.len, dentry->d_name.name, &qstr); } /* @@ -171,7 +172,7 @@ struct dentry *isofs_lookup(struct inode *dir, struct dentry *dentry, struct nam struct inode *inode; struct page *page; - dentry->d_op = dir->i_sb->s_root->d_op; + d_set_d_op(dentry, dir->i_sb->s_root->d_op); page = alloc_page(GFP_USER); if (!page) |