diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-08-28 02:47:00 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-08-28 02:47:00 +0000 |
| commit | 6405c9cd9bf7b1c35ed76ef8ee3e217056285702 (patch) | |
| tree | 0659c9ae17d1375f185f88f4f7fef1a667f375d8 /fs/dcache.c | |
| parent | bcc55c6664a90146149ba0fd93052adc94287b9f (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 101663d15e9..80e93956ace 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1236,7 +1236,7 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry) * If no entry exists with the exact case name, allocate new dentry with * the exact case, and return the spliced entry. */ -struct dentry *d_add_ci(struct inode *inode, struct dentry *dentry, +struct dentry *d_add_ci(struct dentry *dentry, struct inode *inode, struct qstr *name) { int error; |