cleanup
parent
d34acd45bf
commit
dc751c641b
|
@ -681,7 +681,7 @@ runlist_element *ntfs_attr_find_vcn(ntfs_attr *na, const VCN vcn)
|
|||
errno = EINVAL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, vcn %llx\n",
|
||||
(unsigned long long)na->ni->mft_no, na->type,
|
||||
(long long)vcn);
|
||||
|
@ -1580,7 +1580,7 @@ static int ntfs_attr_find(const ATTR_TYPES type, const ntfschar *name,
|
|||
ntfs_volume *vol;
|
||||
ntfschar *upcase;
|
||||
u32 upcase_len;
|
||||
|
||||
|
||||
ntfs_log_trace("Entering.\n");
|
||||
|
||||
if (ctx->ntfs_ino) {
|
||||
|
@ -3909,7 +3909,7 @@ static int ntfs_attr_make_resident(ntfs_attr *na, ntfs_attr_search_ctx *ctx)
|
|||
ATTR_REC *a = ctx->attr;
|
||||
int name_ofs, val_ofs, err = EIO;
|
||||
s64 arec_size, bytes_read;
|
||||
|
||||
|
||||
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
|
||||
long)na->ni->mft_no, na->type);
|
||||
|
||||
|
@ -4916,7 +4916,7 @@ int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize)
|
|||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
|
||||
long)na->ni->mft_no, na->type);
|
||||
|
||||
|
|
|
@ -226,7 +226,7 @@ int ntfs_bitmap_clear_run(ntfs_attr *na, s64 start_bit, s64 count)
|
|||
{
|
||||
ntfs_log_trace("Dealloc from bit 0x%llx, count 0x%llx.\n",
|
||||
(long long)start_bit, (long long)count);
|
||||
|
||||
|
||||
return ntfs_bitmap_set_bits_in_run(na, start_bit, count, 0);
|
||||
}
|
||||
|
||||
|
|
|
@ -1110,7 +1110,6 @@ static ntfs_inode *__ntfs_create(ntfs_inode *dir_ni,
|
|||
ntfschar *target, u8 target_len)
|
||||
{
|
||||
ntfs_inode *ni;
|
||||
ntfs_attr *na;
|
||||
int rollback_data = 0;
|
||||
FILE_NAME_ATTR *fn = NULL;
|
||||
STANDARD_INFORMATION *si = NULL;
|
||||
|
@ -1186,7 +1185,8 @@ static ntfs_inode *__ntfs_create(ntfs_inode *dir_ni,
|
|||
ie->key_length = 0;
|
||||
ie->flags = INDEX_ENTRY_END;
|
||||
/* Add INDEX_ROOT attribute to inode. */
|
||||
if (ntfs_attr_add(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4, (u8*)ir, ir_len)) {
|
||||
if (ntfs_attr_add(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4,
|
||||
(u8*)ir, ir_len)) {
|
||||
err = errno;
|
||||
free(ir);
|
||||
ntfs_log_error("Failed to add INDEX_ROOT attribute.\n");
|
||||
|
@ -1296,6 +1296,8 @@ static ntfs_inode *__ntfs_create(ntfs_inode *dir_ni,
|
|||
err_out:
|
||||
ntfs_log_trace("Failed.\n");
|
||||
if (rollback_data) {
|
||||
ntfs_attr *na;
|
||||
|
||||
na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
|
||||
if (!na)
|
||||
ntfs_log_perror("Failed to open data attribute of "
|
||||
|
|
|
@ -763,7 +763,7 @@ int ntfs_cluster_free(ntfs_volume *vol, ntfs_attr *na, VCN start_vcn, s64 count)
|
|||
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, count 0x%llx, "
|
||||
"vcn 0x%llx.\n", (unsigned long long)na->ni->mft_no,
|
||||
na->type, (long long)count, (long long)start_vcn);
|
||||
|
||||
|
||||
rl = ntfs_attr_find_vcn(na, start_vcn);
|
||||
if (!rl) {
|
||||
if (errno == ENOENT)
|
||||
|
|
Loading…
Reference in New Issue