aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf/truncate.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/udf/truncate.c')
-rw-r--r--fs/udf/truncate.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
index 7fc3912885a5..6931f6bfa1ae 100644
--- a/fs/udf/truncate.c
+++ b/fs/udf/truncate.c
@@ -163,7 +163,7 @@ void udf_discard_prealloc(struct inode *inode)
163 cpu_to_le32(epos.offset - 163 cpu_to_le32(epos.offset -
164 sizeof(struct allocExtDesc)); 164 sizeof(struct allocExtDesc));
165 if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) || 165 if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
166 UDF_SB_UDFREV(inode->i_sb) >= 0x0201) 166 UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
167 udf_update_tag(epos.bh->b_data, epos.offset); 167 udf_update_tag(epos.bh->b_data, epos.offset);
168 else 168 else
169 udf_update_tag(epos.bh->b_data, 169 udf_update_tag(epos.bh->b_data,
@@ -184,6 +184,7 @@ void udf_truncate_extents(struct inode *inode)
184 uint32_t elen, nelen = 0, indirect_ext_len = 0, lenalloc; 184 uint32_t elen, nelen = 0, indirect_ext_len = 0, lenalloc;
185 int8_t etype; 185 int8_t etype;
186 struct super_block *sb = inode->i_sb; 186 struct super_block *sb = inode->i_sb;
187 struct udf_sb_info *sbi = UDF_SB(sb);
187 sector_t first_block = inode->i_size >> sb->s_blocksize_bits, offset; 188 sector_t first_block = inode->i_size >> sb->s_blocksize_bits, offset;
188 loff_t byte_offset; 189 loff_t byte_offset;
189 int adsize; 190 int adsize;
@@ -232,7 +233,7 @@ void udf_truncate_extents(struct inode *inode)
232 aed->lengthAllocDescs = 233 aed->lengthAllocDescs =
233 cpu_to_le32(lenalloc); 234 cpu_to_le32(lenalloc);
234 if (!UDF_QUERY_FLAG(sb, UDF_FLAG_STRICT) || 235 if (!UDF_QUERY_FLAG(sb, UDF_FLAG_STRICT) ||
235 UDF_SB_UDFREV(sb) >= 0x0201) 236 sbi->s_udfrev >= 0x0201)
236 udf_update_tag(epos.bh->b_data, 237 udf_update_tag(epos.bh->b_data,
237 lenalloc + 238 lenalloc +
238 sizeof(struct allocExtDesc)); 239 sizeof(struct allocExtDesc));
@@ -271,7 +272,7 @@ void udf_truncate_extents(struct inode *inode)
271 (struct allocExtDesc *)(epos.bh->b_data); 272 (struct allocExtDesc *)(epos.bh->b_data);
272 aed->lengthAllocDescs = cpu_to_le32(lenalloc); 273 aed->lengthAllocDescs = cpu_to_le32(lenalloc);
273 if (!UDF_QUERY_FLAG(sb, UDF_FLAG_STRICT) || 274 if (!UDF_QUERY_FLAG(sb, UDF_FLAG_STRICT) ||
274 UDF_SB_UDFREV(sb) >= 0x0201) 275 sbi->s_udfrev >= 0x0201)
275 udf_update_tag(epos.bh->b_data, 276 udf_update_tag(epos.bh->b_data,
276 lenalloc + sizeof(struct allocExtDesc)); 277 lenalloc + sizeof(struct allocExtDesc));
277 else 278 else