|
@@ -1652,17 +1652,9 @@ static int udf_update_inode(struct inode *inode, int do_sync)
|
|
|
iinfo->i_ext.i_data, inode->i_sb->s_blocksize -
|
|
|
sizeof(struct unallocSpaceEntry));
|
|
|
use->descTag.tagIdent = cpu_to_le16(TAG_IDENT_USE);
|
|
|
- use->descTag.tagLocation =
|
|
|
- cpu_to_le32(iinfo->i_location.logicalBlockNum);
|
|
|
- crclen = sizeof(struct unallocSpaceEntry) +
|
|
|
- iinfo->i_lenAlloc - sizeof(struct tag);
|
|
|
- use->descTag.descCRCLength = cpu_to_le16(crclen);
|
|
|
- use->descTag.descCRC = cpu_to_le16(crc_itu_t(0, (char *)use +
|
|
|
- sizeof(struct tag),
|
|
|
- crclen));
|
|
|
- use->descTag.tagChecksum = udf_tag_checksum(&use->descTag);
|
|
|
+ crclen = sizeof(struct unallocSpaceEntry);
|
|
|
|
|
|
- goto out;
|
|
|
+ goto finish;
|
|
|
}
|
|
|
|
|
|
if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_FORGET))
|
|
@@ -1782,6 +1774,8 @@ static int udf_update_inode(struct inode *inode, int do_sync)
|
|
|
efe->descTag.tagIdent = cpu_to_le16(TAG_IDENT_EFE);
|
|
|
crclen = sizeof(struct extendedFileEntry);
|
|
|
}
|
|
|
+
|
|
|
+finish:
|
|
|
if (iinfo->i_strat4096) {
|
|
|
fe->icbTag.strategyType = cpu_to_le16(4096);
|
|
|
fe->icbTag.strategyParameter = cpu_to_le16(1);
|
|
@@ -1791,7 +1785,9 @@ static int udf_update_inode(struct inode *inode, int do_sync)
|
|
|
fe->icbTag.numEntries = cpu_to_le16(1);
|
|
|
}
|
|
|
|
|
|
- if (S_ISDIR(inode->i_mode))
|
|
|
+ if (iinfo->i_use)
|
|
|
+ fe->icbTag.fileType = ICBTAG_FILE_TYPE_USE;
|
|
|
+ else if (S_ISDIR(inode->i_mode))
|
|
|
fe->icbTag.fileType = ICBTAG_FILE_TYPE_DIRECTORY;
|
|
|
else if (S_ISREG(inode->i_mode))
|
|
|
fe->icbTag.fileType = ICBTAG_FILE_TYPE_REGULAR;
|
|
@@ -1828,7 +1824,6 @@ static int udf_update_inode(struct inode *inode, int do_sync)
|
|
|
crclen));
|
|
|
fe->descTag.tagChecksum = udf_tag_checksum(&fe->descTag);
|
|
|
|
|
|
-out:
|
|
|
set_buffer_uptodate(bh);
|
|
|
unlock_buffer(bh);
|
|
|
|