@@ -236,6 +236,7 @@ struct ATTRIB *ni_find_attr(struct ntfs_inode *ni, struct ATTRIB *attr,
236
236
return attr ;
237
237
238
238
out :
239
+ ntfs_inode_err (& ni -> vfs_inode , "failed to parse mft record" );
239
240
ntfs_set_state (ni -> mi .sbi , NTFS_DIRTY_ERROR );
240
241
return NULL ;
241
242
}
@@ -1643,14 +1644,13 @@ int ni_delete_all(struct ntfs_inode *ni)
1643
1644
* Return: File name attribute by its value.
1644
1645
*/
1645
1646
struct ATTR_FILE_NAME * ni_fname_name (struct ntfs_inode * ni ,
1646
- const struct cpu_str * uni ,
1647
+ const struct le_str * uni ,
1647
1648
const struct MFT_REF * home_dir ,
1648
1649
struct mft_inode * * mi ,
1649
1650
struct ATTR_LIST_ENTRY * * le )
1650
1651
{
1651
1652
struct ATTRIB * attr = NULL ;
1652
1653
struct ATTR_FILE_NAME * fname ;
1653
- struct le_str * fns ;
1654
1654
1655
1655
if (le )
1656
1656
* le = NULL ;
@@ -1674,10 +1674,9 @@ struct ATTR_FILE_NAME *ni_fname_name(struct ntfs_inode *ni,
1674
1674
if (uni -> len != fname -> name_len )
1675
1675
goto next ;
1676
1676
1677
- fns = ( struct le_str * ) & fname -> name_len ;
1678
- if ( ntfs_cmp_names_cpu ( uni , fns , NULL , false))
1677
+ if ( ntfs_cmp_names ( uni -> name , uni -> len , fname -> name , uni -> len , NULL ,
1678
+ false))
1679
1679
goto next ;
1680
-
1681
1680
return fname ;
1682
1681
}
1683
1682
@@ -2915,7 +2914,7 @@ int ni_remove_name(struct ntfs_inode *dir_ni, struct ntfs_inode *ni,
2915
2914
/* Find name in record. */
2916
2915
mi_get_ref (& dir_ni -> mi , & de_name -> home );
2917
2916
2918
- fname = ni_fname_name (ni , (struct cpu_str * )& de_name -> name_len ,
2917
+ fname = ni_fname_name (ni , (struct le_str * )& de_name -> name_len ,
2919
2918
& de_name -> home , & mi , & le );
2920
2919
if (!fname )
2921
2920
return - ENOENT ;
0 commit comments