2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* linux/fs/hpfs/buffer.c
|
|
|
|
*
|
|
|
|
* Mikulas Patocka (mikulas@artax.karlin.mff.cuni.cz), 1998-1999
|
|
|
|
*
|
|
|
|
* general buffer i/o
|
|
|
|
*/
|
Detach sched.h from mm.h
First thing mm.h does is including sched.h solely for can_do_mlock() inline
function which has "current" dereference inside. By dealing with can_do_mlock()
mm.h can be detached from sched.h which is good. See below, why.
This patch
a) removes unconditional inclusion of sched.h from mm.h
b) makes can_do_mlock() normal function in mm/mlock.c
c) exports can_do_mlock() to not break compilation
d) adds sched.h inclusions back to files that were getting it indirectly.
e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were
getting them indirectly
Net result is:
a) mm.h users would get less code to open, read, preprocess, parse, ... if
they don't need sched.h
b) sched.h stops being dependency for significant number of files:
on x86_64 allmodconfig touching sched.h results in recompile of 4083 files,
after patch it's only 3744 (-8.3%).
Cross-compile tested on
all arm defconfigs, all mips defconfigs, all powerpc defconfigs,
alpha alpha-up
arm
i386 i386-up i386-defconfig i386-allnoconfig
ia64 ia64-up
m68k
mips
parisc parisc-up
powerpc powerpc-up
s390 s390-up
sparc sparc-up
sparc64 sparc64-up
um-x86_64
x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig
as well as my two usual configs.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-21 05:22:52 +08:00
|
|
|
#include <linux/sched.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
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>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include "hpfs_fn.h"
|
|
|
|
|
|
|
|
/* Map a sector into a buffer and return pointers to it and to the buffer. */
|
|
|
|
|
|
|
|
void *hpfs_map_sector(struct super_block *s, unsigned secno, struct buffer_head **bhp,
|
|
|
|
int ahead)
|
|
|
|
{
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
2011-05-09 02:42:54 +08:00
|
|
|
hpfs_lock_assert(s);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
cond_resched();
|
|
|
|
|
|
|
|
*bhp = bh = sb_bread(s, secno);
|
|
|
|
if (bh != NULL)
|
|
|
|
return bh->b_data;
|
|
|
|
else {
|
|
|
|
printk("HPFS: hpfs_map_sector: read error\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Like hpfs_map_sector but don't read anything */
|
|
|
|
|
|
|
|
void *hpfs_get_sector(struct super_block *s, unsigned secno, struct buffer_head **bhp)
|
|
|
|
{
|
|
|
|
struct buffer_head *bh;
|
|
|
|
/*return hpfs_map_sector(s, secno, bhp, 0);*/
|
|
|
|
|
2011-05-09 02:42:54 +08:00
|
|
|
hpfs_lock_assert(s);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
cond_resched();
|
|
|
|
|
|
|
|
if ((*bhp = bh = sb_getblk(s, secno)) != NULL) {
|
|
|
|
if (!buffer_uptodate(bh)) wait_on_buffer(bh);
|
|
|
|
set_buffer_uptodate(bh);
|
|
|
|
return bh->b_data;
|
|
|
|
} else {
|
|
|
|
printk("HPFS: hpfs_get_sector: getblk failed\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Map 4 sectors into a 4buffer and return pointers to it and to the buffer. */
|
|
|
|
|
|
|
|
void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffer_head *qbh,
|
|
|
|
int ahead)
|
|
|
|
{
|
|
|
|
struct buffer_head *bh;
|
|
|
|
char *data;
|
|
|
|
|
2011-05-09 02:42:54 +08:00
|
|
|
hpfs_lock_assert(s);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
cond_resched();
|
|
|
|
|
|
|
|
if (secno & 3) {
|
|
|
|
printk("HPFS: hpfs_map_4sectors: unaligned read\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-09-27 16:49:39 +08:00
|
|
|
qbh->data = data = kmalloc(2048, GFP_NOFS);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!data) {
|
|
|
|
printk("HPFS: hpfs_map_4sectors: out of memory\n");
|
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
|
|
|
|
qbh->bh[0] = bh = sb_bread(s, secno);
|
|
|
|
if (!bh)
|
|
|
|
goto bail0;
|
|
|
|
memcpy(data, bh->b_data, 512);
|
|
|
|
|
|
|
|
qbh->bh[1] = bh = sb_bread(s, secno + 1);
|
|
|
|
if (!bh)
|
|
|
|
goto bail1;
|
|
|
|
memcpy(data + 512, bh->b_data, 512);
|
|
|
|
|
|
|
|
qbh->bh[2] = bh = sb_bread(s, secno + 2);
|
|
|
|
if (!bh)
|
|
|
|
goto bail2;
|
|
|
|
memcpy(data + 2 * 512, bh->b_data, 512);
|
|
|
|
|
|
|
|
qbh->bh[3] = bh = sb_bread(s, secno + 3);
|
|
|
|
if (!bh)
|
|
|
|
goto bail3;
|
|
|
|
memcpy(data + 3 * 512, bh->b_data, 512);
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
|
|
|
bail3:
|
|
|
|
brelse(qbh->bh[2]);
|
|
|
|
bail2:
|
|
|
|
brelse(qbh->bh[1]);
|
|
|
|
bail1:
|
|
|
|
brelse(qbh->bh[0]);
|
|
|
|
bail0:
|
|
|
|
kfree(data);
|
|
|
|
printk("HPFS: hpfs_map_4sectors: read error\n");
|
|
|
|
bail:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Don't read sectors */
|
|
|
|
|
|
|
|
void *hpfs_get_4sectors(struct super_block *s, unsigned secno,
|
|
|
|
struct quad_buffer_head *qbh)
|
|
|
|
{
|
|
|
|
cond_resched();
|
|
|
|
|
2011-05-09 02:42:54 +08:00
|
|
|
hpfs_lock_assert(s);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (secno & 3) {
|
|
|
|
printk("HPFS: hpfs_get_4sectors: unaligned read\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*return hpfs_map_4sectors(s, secno, qbh, 0);*/
|
|
|
|
if (!(qbh->data = kmalloc(2048, GFP_NOFS))) {
|
|
|
|
printk("HPFS: hpfs_get_4sectors: out of memory\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (!(hpfs_get_sector(s, secno, &qbh->bh[0]))) goto bail0;
|
|
|
|
if (!(hpfs_get_sector(s, secno + 1, &qbh->bh[1]))) goto bail1;
|
|
|
|
if (!(hpfs_get_sector(s, secno + 2, &qbh->bh[2]))) goto bail2;
|
|
|
|
if (!(hpfs_get_sector(s, secno + 3, &qbh->bh[3]))) goto bail3;
|
|
|
|
memcpy(qbh->data, qbh->bh[0]->b_data, 512);
|
|
|
|
memcpy(qbh->data + 512, qbh->bh[1]->b_data, 512);
|
|
|
|
memcpy(qbh->data + 2*512, qbh->bh[2]->b_data, 512);
|
|
|
|
memcpy(qbh->data + 3*512, qbh->bh[3]->b_data, 512);
|
|
|
|
return qbh->data;
|
|
|
|
|
|
|
|
bail3: brelse(qbh->bh[2]);
|
|
|
|
bail2: brelse(qbh->bh[1]);
|
|
|
|
bail1: brelse(qbh->bh[0]);
|
|
|
|
bail0:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void hpfs_brelse4(struct quad_buffer_head *qbh)
|
|
|
|
{
|
|
|
|
brelse(qbh->bh[3]);
|
|
|
|
brelse(qbh->bh[2]);
|
|
|
|
brelse(qbh->bh[1]);
|
|
|
|
brelse(qbh->bh[0]);
|
|
|
|
kfree(qbh->data);
|
|
|
|
}
|
|
|
|
|
|
|
|
void hpfs_mark_4buffers_dirty(struct quad_buffer_head *qbh)
|
|
|
|
{
|
|
|
|
PRINTK(("hpfs_mark_4buffers_dirty\n"));
|
|
|
|
memcpy(qbh->bh[0]->b_data, qbh->data, 512);
|
|
|
|
memcpy(qbh->bh[1]->b_data, qbh->data + 512, 512);
|
|
|
|
memcpy(qbh->bh[2]->b_data, qbh->data + 2 * 512, 512);
|
|
|
|
memcpy(qbh->bh[3]->b_data, qbh->data + 3 * 512, 512);
|
|
|
|
mark_buffer_dirty(qbh->bh[0]);
|
|
|
|
mark_buffer_dirty(qbh->bh[1]);
|
|
|
|
mark_buffer_dirty(qbh->bh[2]);
|
|
|
|
mark_buffer_dirty(qbh->bh[3]);
|
|
|
|
}
|