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/xfs/linux-2.6/xfs_iops.c | |
parent | bcc55c6664a90146149ba0fd93052adc94287b9f (diff) | |
parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
download | linux-next-6405c9cd9bf7b1c35ed76ef8ee3e217056285702.tar.gz |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_iops.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 91bcd979242c..095d271f3434 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c @@ -355,7 +355,7 @@ xfs_vn_ci_lookup( /* else case-insensitive match... */ dname.name = ci_name.name; dname.len = ci_name.len; - dentry = d_add_ci(VFS_I(ip), dentry, &dname); + dentry = d_add_ci(dentry, VFS_I(ip), &dname); kmem_free(ci_name.name); return dentry; } |