opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename: ntfs_not_resident_attr_record_add -> ntfs_non_resident_attr_record_add 

ntfs_non_resident_attr_record_add:
 - add cheking for attribute can be non-resident
 - fixed bug: forgot copy name to attribute

(Logical change 1.563)
edge.strict_endians
(none)!yura 2004-09-17 16:34:45 +00:00
parent 6f222626bd
commit 921a40e14b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libntfs/attrib.c
View File

@ -2275,7 +2275,7 @@ static int ntfs_make_room_for_attr(MFT_RECORD *m, u8 *pos, u32 size)
}
/**
* ntfs_not_resident_attr_record_add -
* ntfs_non_resident_attr_record_add -
* @ni:
* @type:
* @name:
@ -2291,7 +2291,7 @@ static int ntfs_make_room_for_attr(MFT_RECORD *m, u8 *pos, u32 size)
* EEXIST -
* EIO -
*/
int ntfs_not_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
int ntfs_non_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
ntfschar *name, u8 name_len, VCN lowest_vcn, int dataruns_size,
ATTR_FLAGS flags)
{
@ -2310,6 +2310,18 @@ int ntfs_not_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
return -1;
}
if (ntfs_attr_can_be_non_resident(ni->vol, type)) {
err = errno;
if (errno == EPERM)
Dprintf("%s(): Attribute can't be resident.\n",
__FUNCTION__);
else
Dprintf("%s(): ntfs_attr_can_be_non_resident failed.\n",
__FUNCTION__);
errno = err;
return -1;
}
ctx = ntfs_attr_get_search_ctx(NULL, ni->mrec);
if (!ctx)
return -1;
@ -2346,6 +2358,8 @@ int ntfs_not_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
a->lowest_vcn = cpu_to_le64(lowest_vcn);
a->mapping_pairs_offset = cpu_to_le16(length - dataruns_size);
a->compression_unit = (flags & ATTR_COMPRESSION_MASK) ? 4 : 0;
memcpy((u8*)a + le16_to_cpu(a->name_offset), name,
sizeof(ntfschar) * name_len);
m->next_attr_instance =
cpu_to_le16(le16_to_cpu(m->next_attr_instance) + 1);
if (ntfs_attrlist_entry_add(ni, a)) {
@ -3529,7 +3543,7 @@ static int ntfs_non_resident_attr_expand(ntfs_attr *na, const s64 newsize)
if (mp_size > cur_max_mp_size)
mp_size = cur_max_mp_size;
/* Add atribute extent to new record. */
err = ntfs_not_resident_attr_record_add(ni, na->type,
err = ntfs_non_resident_attr_record_add(ni, na->type,
na->name, na->name_len, stop_vcn, mp_size, 0);
if (err == -1) {
err = errno;