diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-08-27 22:47:00 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-08-27 22:47:00 -0400 |
| commit | 6405c9cd9bf7b1c35ed76ef8ee3e217056285702 (patch) | |
| tree | 0659c9ae17d1375f185f88f4f7fef1a667f375d8 /fs/xfs/linux-2.6/xfs_iops.c | |
| parent | bcc55c6664a90146149ba0fd93052adc94287b9f (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
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( | |||
| 355 | /* else case-insensitive match... */ | 355 | /* else case-insensitive match... */ |
| 356 | dname.name = ci_name.name; | 356 | dname.name = ci_name.name; |
| 357 | dname.len = ci_name.len; | 357 | dname.len = ci_name.len; |
| 358 | dentry = d_add_ci(VFS_I(ip), dentry, &dname); | 358 | dentry = d_add_ci(dentry, VFS_I(ip), &dname); |
| 359 | kmem_free(ci_name.name); | 359 | kmem_free(ci_name.name); |
| 360 | return dentry; | 360 | return dentry; |
| 361 | } | 361 | } |