Skip to content

Commit

Permalink
udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution
Browse files Browse the repository at this point in the history
This work was supported by a hardware donation from the CE Linux Forum.

Signed-off-by: Alessio Igor Bogani <[email protected]>
Signed-off-by: Jan Kara <[email protected]>
  • Loading branch information
Alessio Igor Bogani authored and jankara committed Jan 6, 2011
1 parent 4d0fb62 commit 7db09be
Showing 1 changed file with 19 additions and 8 deletions.
27 changes: 19 additions & 8 deletions fs/udf/partition.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/buffer_head.h>
#include <linux/mutex.h>

uint32_t udf_get_pblock(struct super_block *sb, uint32_t block,
uint16_t partition, uint32_t offset)
Expand Down Expand Up @@ -159,7 +160,9 @@ int udf_relocate_blocks(struct super_block *sb, long old_block, long *new_block)
struct udf_sb_info *sbi = UDF_SB(sb);
u16 reallocationTableLen;
struct buffer_head *bh;
int ret = 0;

mutex_lock(&sbi->s_alloc_mutex);
for (i = 0; i < sbi->s_partitions; i++) {
struct udf_part_map *map = &sbi->s_partmaps[i];
if (old_block > map->s_partition_root &&
Expand All @@ -175,8 +178,10 @@ int udf_relocate_blocks(struct super_block *sb, long old_block, long *new_block)
break;
}

if (!st)
return 1;
if (!st) {
ret = 1;
goto out;
}

reallocationTableLen =
le16_to_cpu(st->reallocationTableLen);
Expand Down Expand Up @@ -207,14 +212,16 @@ int udf_relocate_blocks(struct super_block *sb, long old_block, long *new_block)
((old_block -
map->s_partition_root) &
(sdata->s_packet_len - 1));
return 0;
ret = 0;
goto out;
} else if (origLoc == packet) {
*new_block = le32_to_cpu(
entry->mappedLocation) +
((old_block -
map->s_partition_root) &
(sdata->s_packet_len - 1));
return 0;
ret = 0;
goto out;
} else if (origLoc > packet)
break;
}
Expand Down Expand Up @@ -251,20 +258,24 @@ int udf_relocate_blocks(struct super_block *sb, long old_block, long *new_block)
st->mapEntry[k].mappedLocation) +
((old_block - map->s_partition_root) &
(sdata->s_packet_len - 1));
return 0;
ret = 0;
goto out;
}

return 1;
ret = 1;
goto out;
} /* if old_block */
}

if (i == sbi->s_partitions) {
/* outside of partitions */
/* for now, fail =) */
return 1;
ret = 1;
}

return 0;
out:
mutex_unlock(&sbi->s_alloc_mutex);
return ret;
}

static uint32_t udf_try_read_meta(struct inode *inode, uint32_t block,
Expand Down

0 comments on commit 7db09be

Please sign in to comment.