aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2017-01-06 15:54:41 -0500
committerJan Kara <jack@suse.cz>2017-01-10 05:57:34 -0500
commit23bcda112f77da278898841615c7530c3e91a537 (patch)
treeeab6c30d9acceffe706831f43d5a10f20abeb02b /fs/udf
parent54bb60d53114b83473ba1c622be4cca9533b9827 (diff)
udf: atomically read inode size
See i_size_read() comments in include/linux/fs.h Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/lowlevel.c2
-rw-r--r--fs/udf/super.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c
index 6ad5a453af97..5c7ec121990d 100644
--- a/fs/udf/lowlevel.c
+++ b/fs/udf/lowlevel.c
@@ -58,7 +58,7 @@ unsigned long udf_get_last_block(struct super_block *sb)
58 */ 58 */
59 if (ioctl_by_bdev(bdev, CDROM_LAST_WRITTEN, (unsigned long) &lblock) || 59 if (ioctl_by_bdev(bdev, CDROM_LAST_WRITTEN, (unsigned long) &lblock) ||
60 lblock == 0) 60 lblock == 0)
61 lblock = bdev->bd_inode->i_size >> sb->s_blocksize_bits; 61 lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits;
62 62
63 if (lblock) 63 if (lblock)
64 return lblock - 1; 64 return lblock - 1;
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 9256117ffa27..6b5a1a45a6c1 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1213,7 +1213,8 @@ static int udf_load_vat(struct super_block *sb, int p_index, int type1_index)
1213 struct udf_inode_info *vati; 1213 struct udf_inode_info *vati;
1214 uint32_t pos; 1214 uint32_t pos;
1215 struct virtualAllocationTable20 *vat20; 1215 struct virtualAllocationTable20 *vat20;
1216 sector_t blocks = sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits; 1216 sector_t blocks = i_size_read(sb->s_bdev->bd_inode) >>
1217 sb->s_blocksize_bits;
1217 1218
1218 udf_find_vat_block(sb, p_index, type1_index, sbi->s_last_block); 1219 udf_find_vat_block(sb, p_index, type1_index, sbi->s_last_block);
1219 if (!sbi->s_vat_inode && 1220 if (!sbi->s_vat_inode &&
@@ -1803,7 +1804,7 @@ static int udf_check_anchor_block(struct super_block *sb, sector_t block,
1803 1804
1804 if (UDF_QUERY_FLAG(sb, UDF_FLAG_VARCONV) && 1805 if (UDF_QUERY_FLAG(sb, UDF_FLAG_VARCONV) &&
1805 udf_fixed_to_variable(block) >= 1806 udf_fixed_to_variable(block) >=
1806 sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits) 1807 i_size_read(sb->s_bdev->bd_inode) >> sb->s_blocksize_bits)
1807 return -EAGAIN; 1808 return -EAGAIN;
1808 1809
1809 bh = udf_read_tagged(sb, block, block, &ident); 1810 bh = udf_read_tagged(sb, block, block, &ident);
@@ -1865,7 +1866,7 @@ static int udf_scan_anchors(struct super_block *sb, sector_t *lastblock,
1865 last[last_count++] = *lastblock - 152; 1866 last[last_count++] = *lastblock - 152;
1866 1867
1867 for (i = 0; i < last_count; i++) { 1868 for (i = 0; i < last_count; i++) {
1868 if (last[i] >= sb->s_bdev->bd_inode->i_size >> 1869 if (last[i] >= i_size_read(sb->s_bdev->bd_inode) >>
1869 sb->s_blocksize_bits) 1870 sb->s_blocksize_bits)
1870 continue; 1871 continue;
1871 ret = udf_check_anchor_block(sb, last[i], fileset); 1872 ret = udf_check_anchor_block(sb, last[i], fileset);