mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-16 05:50:19 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
324 lines
8.3 KiB
C
324 lines
8.3 KiB
C
/*
|
|
* partition.c
|
|
*
|
|
* PURPOSE
|
|
* Partition handling routines for the OSTA-UDF(tm) filesystem.
|
|
*
|
|
* COPYRIGHT
|
|
* This file is distributed under the terms of the GNU General Public
|
|
* License (GPL). Copies of the GPL can be obtained from:
|
|
* ftp://prep.ai.mit.edu/pub/gnu/GPL
|
|
* Each contributing author retains all rights to their own work.
|
|
*
|
|
* (C) 1998-2001 Ben Fennema
|
|
*
|
|
* HISTORY
|
|
*
|
|
* 12/06/98 blf Created file.
|
|
*
|
|
*/
|
|
|
|
#include "udfdecl.h"
|
|
#include "udf_sb.h"
|
|
#include "udf_i.h"
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/string.h>
|
|
#include <linux/buffer_head.h>
|
|
|
|
uint32_t udf_get_pblock(struct super_block *sb, uint32_t block,
|
|
uint16_t partition, uint32_t offset)
|
|
{
|
|
struct udf_sb_info *sbi = UDF_SB(sb);
|
|
struct udf_part_map *map;
|
|
if (partition >= sbi->s_partitions) {
|
|
udf_debug("block=%d, partition=%d, offset=%d: "
|
|
"invalid partition\n", block, partition, offset);
|
|
return 0xFFFFFFFF;
|
|
}
|
|
map = &sbi->s_partmaps[partition];
|
|
if (map->s_partition_func)
|
|
return map->s_partition_func(sb, block, partition, offset);
|
|
else
|
|
return map->s_partition_root + block + offset;
|
|
}
|
|
|
|
uint32_t udf_get_pblock_virt15(struct super_block *sb, uint32_t block,
|
|
uint16_t partition, uint32_t offset)
|
|
{
|
|
struct buffer_head *bh = NULL;
|
|
uint32_t newblock;
|
|
uint32_t index;
|
|
uint32_t loc;
|
|
struct udf_sb_info *sbi = UDF_SB(sb);
|
|
struct udf_part_map *map;
|
|
struct udf_virtual_data *vdata;
|
|
struct udf_inode_info *iinfo = UDF_I(sbi->s_vat_inode);
|
|
|
|
map = &sbi->s_partmaps[partition];
|
|
vdata = &map->s_type_specific.s_virtual;
|
|
|
|
if (block > vdata->s_num_entries) {
|
|
udf_debug("Trying to access block beyond end of VAT "
|
|
"(%d max %d)\n", block, vdata->s_num_entries);
|
|
return 0xFFFFFFFF;
|
|
}
|
|
|
|
if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
|
|
loc = le32_to_cpu(((__le32 *)(iinfo->i_ext.i_data +
|
|
vdata->s_start_offset))[block]);
|
|
goto translate;
|
|
}
|
|
index = (sb->s_blocksize - vdata->s_start_offset) / sizeof(uint32_t);
|
|
if (block >= index) {
|
|
block -= index;
|
|
newblock = 1 + (block / (sb->s_blocksize / sizeof(uint32_t)));
|
|
index = block % (sb->s_blocksize / sizeof(uint32_t));
|
|
} else {
|
|
newblock = 0;
|
|
index = vdata->s_start_offset / sizeof(uint32_t) + block;
|
|
}
|
|
|
|
loc = udf_block_map(sbi->s_vat_inode, newblock);
|
|
|
|
bh = sb_bread(sb, loc);
|
|
if (!bh) {
|
|
udf_debug("get_pblock(UDF_VIRTUAL_MAP:%p,%d,%d) VAT: %d[%d]\n",
|
|
sb, block, partition, loc, index);
|
|
return 0xFFFFFFFF;
|
|
}
|
|
|
|
loc = le32_to_cpu(((__le32 *)bh->b_data)[index]);
|
|
|
|
brelse(bh);
|
|
|
|
translate:
|
|
if (iinfo->i_location.partitionReferenceNum == partition) {
|
|
udf_debug("recursive call to udf_get_pblock!\n");
|
|
return 0xFFFFFFFF;
|
|
}
|
|
|
|
return udf_get_pblock(sb, loc,
|
|
iinfo->i_location.partitionReferenceNum,
|
|
offset);
|
|
}
|
|
|
|
inline uint32_t udf_get_pblock_virt20(struct super_block *sb, uint32_t block,
|
|
uint16_t partition, uint32_t offset)
|
|
{
|
|
return udf_get_pblock_virt15(sb, block, partition, offset);
|
|
}
|
|
|
|
uint32_t udf_get_pblock_spar15(struct super_block *sb, uint32_t block,
|
|
uint16_t partition, uint32_t offset)
|
|
{
|
|
int i;
|
|
struct sparingTable *st = NULL;
|
|
struct udf_sb_info *sbi = UDF_SB(sb);
|
|
struct udf_part_map *map;
|
|
uint32_t packet;
|
|
struct udf_sparing_data *sdata;
|
|
|
|
map = &sbi->s_partmaps[partition];
|
|
sdata = &map->s_type_specific.s_sparing;
|
|
packet = (block + offset) & ~(sdata->s_packet_len - 1);
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
if (sdata->s_spar_map[i] != NULL) {
|
|
st = (struct sparingTable *)
|
|
sdata->s_spar_map[i]->b_data;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (st) {
|
|
for (i = 0; i < le16_to_cpu(st->reallocationTableLen); i++) {
|
|
struct sparingEntry *entry = &st->mapEntry[i];
|
|
u32 origLoc = le32_to_cpu(entry->origLocation);
|
|
if (origLoc >= 0xFFFFFFF0)
|
|
break;
|
|
else if (origLoc == packet)
|
|
return le32_to_cpu(entry->mappedLocation) +
|
|
((block + offset) &
|
|
(sdata->s_packet_len - 1));
|
|
else if (origLoc > packet)
|
|
break;
|
|
}
|
|
}
|
|
|
|
return map->s_partition_root + block + offset;
|
|
}
|
|
|
|
int udf_relocate_blocks(struct super_block *sb, long old_block, long *new_block)
|
|
{
|
|
struct udf_sparing_data *sdata;
|
|
struct sparingTable *st = NULL;
|
|
struct sparingEntry mapEntry;
|
|
uint32_t packet;
|
|
int i, j, k, l;
|
|
struct udf_sb_info *sbi = UDF_SB(sb);
|
|
u16 reallocationTableLen;
|
|
struct buffer_head *bh;
|
|
|
|
for (i = 0; i < sbi->s_partitions; i++) {
|
|
struct udf_part_map *map = &sbi->s_partmaps[i];
|
|
if (old_block > map->s_partition_root &&
|
|
old_block < map->s_partition_root + map->s_partition_len) {
|
|
sdata = &map->s_type_specific.s_sparing;
|
|
packet = (old_block - map->s_partition_root) &
|
|
~(sdata->s_packet_len - 1);
|
|
|
|
for (j = 0; j < 4; j++)
|
|
if (sdata->s_spar_map[j] != NULL) {
|
|
st = (struct sparingTable *)
|
|
sdata->s_spar_map[j]->b_data;
|
|
break;
|
|
}
|
|
|
|
if (!st)
|
|
return 1;
|
|
|
|
reallocationTableLen =
|
|
le16_to_cpu(st->reallocationTableLen);
|
|
for (k = 0; k < reallocationTableLen; k++) {
|
|
struct sparingEntry *entry = &st->mapEntry[k];
|
|
u32 origLoc = le32_to_cpu(entry->origLocation);
|
|
|
|
if (origLoc == 0xFFFFFFFF) {
|
|
for (; j < 4; j++) {
|
|
int len;
|
|
bh = sdata->s_spar_map[j];
|
|
if (!bh)
|
|
continue;
|
|
|
|
st = (struct sparingTable *)
|
|
bh->b_data;
|
|
entry->origLocation =
|
|
cpu_to_le32(packet);
|
|
len =
|
|
sizeof(struct sparingTable) +
|
|
reallocationTableLen *
|
|
sizeof(struct sparingEntry);
|
|
udf_update_tag((char *)st, len);
|
|
mark_buffer_dirty(bh);
|
|
}
|
|
*new_block = le32_to_cpu(
|
|
entry->mappedLocation) +
|
|
((old_block -
|
|
map->s_partition_root) &
|
|
(sdata->s_packet_len - 1));
|
|
return 0;
|
|
} else if (origLoc == packet) {
|
|
*new_block = le32_to_cpu(
|
|
entry->mappedLocation) +
|
|
((old_block -
|
|
map->s_partition_root) &
|
|
(sdata->s_packet_len - 1));
|
|
return 0;
|
|
} else if (origLoc > packet)
|
|
break;
|
|
}
|
|
|
|
for (l = k; l < reallocationTableLen; l++) {
|
|
struct sparingEntry *entry = &st->mapEntry[l];
|
|
u32 origLoc = le32_to_cpu(entry->origLocation);
|
|
|
|
if (origLoc != 0xFFFFFFFF)
|
|
continue;
|
|
|
|
for (; j < 4; j++) {
|
|
bh = sdata->s_spar_map[j];
|
|
if (!bh)
|
|
continue;
|
|
|
|
st = (struct sparingTable *)bh->b_data;
|
|
mapEntry = st->mapEntry[l];
|
|
mapEntry.origLocation =
|
|
cpu_to_le32(packet);
|
|
memmove(&st->mapEntry[k + 1],
|
|
&st->mapEntry[k],
|
|
(l - k) *
|
|
sizeof(struct sparingEntry));
|
|
st->mapEntry[k] = mapEntry;
|
|
udf_update_tag((char *)st,
|
|
sizeof(struct sparingTable) +
|
|
reallocationTableLen *
|
|
sizeof(struct sparingEntry));
|
|
mark_buffer_dirty(bh);
|
|
}
|
|
*new_block =
|
|
le32_to_cpu(
|
|
st->mapEntry[k].mappedLocation) +
|
|
((old_block - map->s_partition_root) &
|
|
(sdata->s_packet_len - 1));
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
} /* if old_block */
|
|
}
|
|
|
|
if (i == sbi->s_partitions) {
|
|
/* outside of partitions */
|
|
/* for now, fail =) */
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static uint32_t udf_try_read_meta(struct inode *inode, uint32_t block,
|
|
uint16_t partition, uint32_t offset)
|
|
{
|
|
struct super_block *sb = inode->i_sb;
|
|
struct udf_part_map *map;
|
|
struct kernel_lb_addr eloc;
|
|
uint32_t elen;
|
|
sector_t ext_offset;
|
|
struct extent_position epos = {};
|
|
uint32_t phyblock;
|
|
|
|
if (inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset) !=
|
|
(EXT_RECORDED_ALLOCATED >> 30))
|
|
phyblock = 0xFFFFFFFF;
|
|
else {
|
|
map = &UDF_SB(sb)->s_partmaps[partition];
|
|
/* map to sparable/physical partition desc */
|
|
phyblock = udf_get_pblock(sb, eloc.logicalBlockNum,
|
|
map->s_partition_num, ext_offset + offset);
|
|
}
|
|
|
|
brelse(epos.bh);
|
|
return phyblock;
|
|
}
|
|
|
|
uint32_t udf_get_pblock_meta25(struct super_block *sb, uint32_t block,
|
|
uint16_t partition, uint32_t offset)
|
|
{
|
|
struct udf_sb_info *sbi = UDF_SB(sb);
|
|
struct udf_part_map *map;
|
|
struct udf_meta_data *mdata;
|
|
uint32_t retblk;
|
|
struct inode *inode;
|
|
|
|
udf_debug("READING from METADATA\n");
|
|
|
|
map = &sbi->s_partmaps[partition];
|
|
mdata = &map->s_type_specific.s_metadata;
|
|
inode = mdata->s_metadata_fe ? : mdata->s_mirror_fe;
|
|
|
|
/* We shouldn't mount such media... */
|
|
BUG_ON(!inode);
|
|
retblk = udf_try_read_meta(inode, block, partition, offset);
|
|
if (retblk == 0xFFFFFFFF) {
|
|
udf_warning(sb, __func__, "error reading from METADATA, "
|
|
"trying to read from MIRROR");
|
|
inode = mdata->s_mirror_fe;
|
|
if (!inode)
|
|
return 0xFFFFFFFF;
|
|
retblk = udf_try_read_meta(inode, block, partition, offset);
|
|
}
|
|
|
|
return retblk;
|
|
}
|