2007-10-09 11:23:51 +00:00
|
|
|
#include <linux/blkdev.h>
|
|
|
|
#include <linux/blkpg.h>
|
|
|
|
#include <linux/blktrace_api.h>
|
|
|
|
#include <linux/cdrom.h>
|
|
|
|
#include <linux/compat.h>
|
|
|
|
#include <linux/elevator.h>
|
|
|
|
#include <linux/fd.h>
|
|
|
|
#include <linux/hdreg.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 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2007-10-09 11:23:51 +00:00
|
|
|
#include <linux/syscalls.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/uaccess.h>
|
|
|
|
|
|
|
|
static int compat_put_ushort(unsigned long arg, unsigned short val)
|
|
|
|
{
|
|
|
|
return put_user(val, (unsigned short __user *)compat_ptr(arg));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int compat_put_int(unsigned long arg, int val)
|
|
|
|
{
|
|
|
|
return put_user(val, (compat_int_t __user *)compat_ptr(arg));
|
|
|
|
}
|
|
|
|
|
2009-10-03 18:52:01 +00:00
|
|
|
static int compat_put_uint(unsigned long arg, unsigned int val)
|
|
|
|
{
|
|
|
|
return put_user(val, (compat_uint_t __user *)compat_ptr(arg));
|
|
|
|
}
|
|
|
|
|
2007-10-09 11:23:51 +00:00
|
|
|
static int compat_put_long(unsigned long arg, long val)
|
|
|
|
{
|
|
|
|
return put_user(val, (compat_long_t __user *)compat_ptr(arg));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int compat_put_ulong(unsigned long arg, compat_ulong_t val)
|
|
|
|
{
|
|
|
|
return put_user(val, (compat_ulong_t __user *)compat_ptr(arg));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int compat_put_u64(unsigned long arg, u64 val)
|
|
|
|
{
|
|
|
|
return put_user(val, (compat_u64 __user *)compat_ptr(arg));
|
|
|
|
}
|
|
|
|
|
2007-10-09 11:23:55 +00:00
|
|
|
struct compat_hd_geometry {
|
|
|
|
unsigned char heads;
|
|
|
|
unsigned char sectors;
|
|
|
|
unsigned short cylinders;
|
|
|
|
u32 start;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int compat_hdio_getgeo(struct gendisk *disk, struct block_device *bdev,
|
|
|
|
struct compat_hd_geometry __user *ugeo)
|
|
|
|
{
|
|
|
|
struct hd_geometry geo;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!ugeo)
|
|
|
|
return -EINVAL;
|
|
|
|
if (!disk->fops->getgeo)
|
|
|
|
return -ENOTTY;
|
|
|
|
|
2013-07-03 22:01:12 +00:00
|
|
|
memset(&geo, 0, sizeof(geo));
|
2007-10-09 11:23:55 +00:00
|
|
|
/*
|
|
|
|
* We need to set the startsect first, the driver may
|
|
|
|
* want to override it.
|
|
|
|
*/
|
|
|
|
geo.start = get_start_sect(bdev);
|
|
|
|
ret = disk->fops->getgeo(bdev, &geo);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
ret = copy_to_user(ugeo, &geo, 4);
|
2013-09-11 21:23:18 +00:00
|
|
|
ret |= put_user(geo.start, &ugeo->start);
|
2007-10-09 11:23:55 +00:00
|
|
|
if (ret)
|
|
|
|
ret = -EFAULT;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-02-23 03:02:50 +00:00
|
|
|
static int compat_hdio_ioctl(struct block_device *bdev, fmode_t mode,
|
|
|
|
unsigned int cmd, unsigned long arg)
|
2007-10-09 11:23:55 +00:00
|
|
|
{
|
|
|
|
mm_segment_t old_fs = get_fs();
|
|
|
|
unsigned long kval;
|
|
|
|
unsigned int __user *uvp;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
set_fs(KERNEL_DS);
|
2008-02-23 03:02:50 +00:00
|
|
|
error = __blkdev_driver_ioctl(bdev, mode,
|
2007-10-09 11:23:55 +00:00
|
|
|
cmd, (unsigned long)(&kval));
|
|
|
|
set_fs(old_fs);
|
|
|
|
|
|
|
|
if (error == 0) {
|
|
|
|
uvp = compat_ptr(arg);
|
|
|
|
if (put_user(kval, uvp))
|
|
|
|
error = -EFAULT;
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2007-10-09 11:23:56 +00:00
|
|
|
struct compat_cdrom_read_audio {
|
|
|
|
union cdrom_addr addr;
|
|
|
|
u8 addr_format;
|
|
|
|
compat_int_t nframes;
|
|
|
|
compat_caddr_t buf;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct compat_cdrom_generic_command {
|
|
|
|
unsigned char cmd[CDROM_PACKET_SIZE];
|
|
|
|
compat_caddr_t buffer;
|
|
|
|
compat_uint_t buflen;
|
|
|
|
compat_int_t stat;
|
|
|
|
compat_caddr_t sense;
|
|
|
|
unsigned char data_direction;
|
|
|
|
compat_int_t quiet;
|
|
|
|
compat_int_t timeout;
|
|
|
|
compat_caddr_t reserved[1];
|
|
|
|
};
|
|
|
|
|
2008-02-23 03:02:50 +00:00
|
|
|
static int compat_cdrom_read_audio(struct block_device *bdev, fmode_t mode,
|
|
|
|
unsigned int cmd, unsigned long arg)
|
2007-10-09 11:23:56 +00:00
|
|
|
{
|
|
|
|
struct cdrom_read_audio __user *cdread_audio;
|
|
|
|
struct compat_cdrom_read_audio __user *cdread_audio32;
|
|
|
|
__u32 data;
|
|
|
|
void __user *datap;
|
|
|
|
|
|
|
|
cdread_audio = compat_alloc_user_space(sizeof(*cdread_audio));
|
|
|
|
cdread_audio32 = compat_ptr(arg);
|
|
|
|
|
|
|
|
if (copy_in_user(&cdread_audio->addr,
|
|
|
|
&cdread_audio32->addr,
|
|
|
|
(sizeof(*cdread_audio32) -
|
|
|
|
sizeof(compat_caddr_t))))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
if (get_user(data, &cdread_audio32->buf))
|
|
|
|
return -EFAULT;
|
|
|
|
datap = compat_ptr(data);
|
|
|
|
if (put_user(datap, &cdread_audio->buf))
|
|
|
|
return -EFAULT;
|
|
|
|
|
2008-02-23 03:02:50 +00:00
|
|
|
return __blkdev_driver_ioctl(bdev, mode, cmd,
|
2007-10-09 11:23:56 +00:00
|
|
|
(unsigned long)cdread_audio);
|
|
|
|
}
|
|
|
|
|
2008-02-23 03:02:50 +00:00
|
|
|
static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
|
|
|
|
unsigned int cmd, unsigned long arg)
|
2007-10-09 11:23:56 +00:00
|
|
|
{
|
|
|
|
struct cdrom_generic_command __user *cgc;
|
|
|
|
struct compat_cdrom_generic_command __user *cgc32;
|
|
|
|
u32 data;
|
|
|
|
unsigned char dir;
|
|
|
|
int itmp;
|
|
|
|
|
|
|
|
cgc = compat_alloc_user_space(sizeof(*cgc));
|
|
|
|
cgc32 = compat_ptr(arg);
|
|
|
|
|
|
|
|
if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
|
|
|
|
get_user(data, &cgc32->buffer) ||
|
|
|
|
put_user(compat_ptr(data), &cgc->buffer) ||
|
|
|
|
copy_in_user(&cgc->buflen, &cgc32->buflen,
|
|
|
|
(sizeof(unsigned int) + sizeof(int))) ||
|
|
|
|
get_user(data, &cgc32->sense) ||
|
|
|
|
put_user(compat_ptr(data), &cgc->sense) ||
|
|
|
|
get_user(dir, &cgc32->data_direction) ||
|
|
|
|
put_user(dir, &cgc->data_direction) ||
|
|
|
|
get_user(itmp, &cgc32->quiet) ||
|
|
|
|
put_user(itmp, &cgc->quiet) ||
|
|
|
|
get_user(itmp, &cgc32->timeout) ||
|
|
|
|
put_user(itmp, &cgc->timeout) ||
|
|
|
|
get_user(data, &cgc32->reserved[0]) ||
|
|
|
|
put_user(compat_ptr(data), &cgc->reserved[0]))
|
|
|
|
return -EFAULT;
|
|
|
|
|
2008-02-23 03:02:50 +00:00
|
|
|
return __blkdev_driver_ioctl(bdev, mode, cmd, (unsigned long)cgc);
|
2007-10-09 11:23:56 +00:00
|
|
|
}
|
|
|
|
|
2007-10-09 11:23:56 +00:00
|
|
|
struct compat_blkpg_ioctl_arg {
|
|
|
|
compat_int_t op;
|
|
|
|
compat_int_t flags;
|
|
|
|
compat_int_t datalen;
|
|
|
|
compat_caddr_t data;
|
|
|
|
};
|
|
|
|
|
2008-09-19 07:17:36 +00:00
|
|
|
static int compat_blkpg_ioctl(struct block_device *bdev, fmode_t mode,
|
2007-10-09 11:23:56 +00:00
|
|
|
unsigned int cmd, struct compat_blkpg_ioctl_arg __user *ua32)
|
|
|
|
{
|
|
|
|
struct blkpg_ioctl_arg __user *a = compat_alloc_user_space(sizeof(*a));
|
|
|
|
compat_caddr_t udata;
|
|
|
|
compat_int_t n;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = get_user(n, &ua32->op);
|
|
|
|
err |= put_user(n, &a->op);
|
|
|
|
err |= get_user(n, &ua32->flags);
|
|
|
|
err |= put_user(n, &a->flags);
|
|
|
|
err |= get_user(n, &ua32->datalen);
|
|
|
|
err |= put_user(n, &a->datalen);
|
|
|
|
err |= get_user(udata, &ua32->data);
|
|
|
|
err |= put_user(compat_ptr(udata), &a->data);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2008-09-19 07:17:36 +00:00
|
|
|
return blkdev_ioctl(bdev, mode, cmd, (unsigned long)a);
|
2007-10-09 11:23:56 +00:00
|
|
|
}
|
|
|
|
|
2007-10-09 11:23:51 +00:00
|
|
|
#define BLKBSZGET_32 _IOR(0x12, 112, int)
|
|
|
|
#define BLKBSZSET_32 _IOW(0x12, 113, int)
|
|
|
|
#define BLKGETSIZE64_32 _IOR(0x12, 114, int)
|
|
|
|
|
2007-10-09 11:23:57 +00:00
|
|
|
struct compat_floppy_drive_params {
|
|
|
|
char cmos;
|
|
|
|
compat_ulong_t max_dtr;
|
|
|
|
compat_ulong_t hlt;
|
|
|
|
compat_ulong_t hut;
|
|
|
|
compat_ulong_t srt;
|
|
|
|
compat_ulong_t spinup;
|
|
|
|
compat_ulong_t spindown;
|
|
|
|
unsigned char spindown_offset;
|
|
|
|
unsigned char select_delay;
|
|
|
|
unsigned char rps;
|
|
|
|
unsigned char tracks;
|
|
|
|
compat_ulong_t timeout;
|
|
|
|
unsigned char interleave_sect;
|
|
|
|
struct floppy_max_errors max_errors;
|
|
|
|
char flags;
|
|
|
|
char read_track;
|
|
|
|
short autodetect[8];
|
|
|
|
compat_int_t checkfreq;
|
|
|
|
compat_int_t native_format;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct compat_floppy_drive_struct {
|
|
|
|
signed char flags;
|
|
|
|
compat_ulong_t spinup_date;
|
|
|
|
compat_ulong_t select_date;
|
|
|
|
compat_ulong_t first_read_date;
|
|
|
|
short probed_format;
|
|
|
|
short track;
|
|
|
|
short maxblock;
|
|
|
|
short maxtrack;
|
|
|
|
compat_int_t generation;
|
|
|
|
compat_int_t keep_data;
|
|
|
|
compat_int_t fd_ref;
|
|
|
|
compat_int_t fd_device;
|
|
|
|
compat_int_t last_checked;
|
|
|
|
compat_caddr_t dmabuf;
|
|
|
|
compat_int_t bufblocks;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct compat_floppy_fdc_state {
|
|
|
|
compat_int_t spec1;
|
|
|
|
compat_int_t spec2;
|
|
|
|
compat_int_t dtr;
|
|
|
|
unsigned char version;
|
|
|
|
unsigned char dor;
|
|
|
|
compat_ulong_t address;
|
|
|
|
unsigned int rawcmd:2;
|
|
|
|
unsigned int reset:1;
|
|
|
|
unsigned int need_configure:1;
|
|
|
|
unsigned int perp_mode:2;
|
|
|
|
unsigned int has_fifo:1;
|
|
|
|
unsigned int driver_version;
|
|
|
|
unsigned char track[4];
|
|
|
|
};
|
|
|
|
|
|
|
|
struct compat_floppy_write_errors {
|
|
|
|
unsigned int write_errors;
|
|
|
|
compat_ulong_t first_error_sector;
|
|
|
|
compat_int_t first_error_generation;
|
|
|
|
compat_ulong_t last_error_sector;
|
|
|
|
compat_int_t last_error_generation;
|
|
|
|
compat_uint_t badness;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define FDSETPRM32 _IOW(2, 0x42, struct compat_floppy_struct)
|
|
|
|
#define FDDEFPRM32 _IOW(2, 0x43, struct compat_floppy_struct)
|
|
|
|
#define FDSETDRVPRM32 _IOW(2, 0x90, struct compat_floppy_drive_params)
|
|
|
|
#define FDGETDRVPRM32 _IOR(2, 0x11, struct compat_floppy_drive_params)
|
|
|
|
#define FDGETDRVSTAT32 _IOR(2, 0x12, struct compat_floppy_drive_struct)
|
|
|
|
#define FDPOLLDRVSTAT32 _IOR(2, 0x13, struct compat_floppy_drive_struct)
|
|
|
|
#define FDGETFDCSTAT32 _IOR(2, 0x15, struct compat_floppy_fdc_state)
|
|
|
|
#define FDWERRORGET32 _IOR(2, 0x17, struct compat_floppy_write_errors)
|
|
|
|
|
|
|
|
static struct {
|
|
|
|
unsigned int cmd32;
|
|
|
|
unsigned int cmd;
|
|
|
|
} fd_ioctl_trans_table[] = {
|
|
|
|
{ FDSETPRM32, FDSETPRM },
|
|
|
|
{ FDDEFPRM32, FDDEFPRM },
|
|
|
|
{ FDGETPRM32, FDGETPRM },
|
|
|
|
{ FDSETDRVPRM32, FDSETDRVPRM },
|
|
|
|
{ FDGETDRVPRM32, FDGETDRVPRM },
|
|
|
|
{ FDGETDRVSTAT32, FDGETDRVSTAT },
|
|
|
|
{ FDPOLLDRVSTAT32, FDPOLLDRVSTAT },
|
|
|
|
{ FDGETFDCSTAT32, FDGETFDCSTAT },
|
|
|
|
{ FDWERRORGET32, FDWERRORGET }
|
|
|
|
};
|
|
|
|
|
|
|
|
#define NR_FD_IOCTL_TRANS ARRAY_SIZE(fd_ioctl_trans_table)
|
|
|
|
|
2008-02-23 03:02:50 +00:00
|
|
|
static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
|
|
|
|
unsigned int cmd, unsigned long arg)
|
2007-10-09 11:23:57 +00:00
|
|
|
{
|
|
|
|
mm_segment_t old_fs = get_fs();
|
|
|
|
void *karg = NULL;
|
|
|
|
unsigned int kcmd = 0;
|
|
|
|
int i, err;
|
|
|
|
|
|
|
|
for (i = 0; i < NR_FD_IOCTL_TRANS; i++)
|
|
|
|
if (cmd == fd_ioctl_trans_table[i].cmd32) {
|
|
|
|
kcmd = fd_ioctl_trans_table[i].cmd;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!kcmd)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case FDSETPRM32:
|
|
|
|
case FDDEFPRM32:
|
|
|
|
case FDGETPRM32:
|
|
|
|
{
|
|
|
|
compat_uptr_t name;
|
|
|
|
struct compat_floppy_struct __user *uf;
|
|
|
|
struct floppy_struct *f;
|
|
|
|
|
|
|
|
uf = compat_ptr(arg);
|
|
|
|
f = karg = kmalloc(sizeof(struct floppy_struct), GFP_KERNEL);
|
|
|
|
if (!karg)
|
|
|
|
return -ENOMEM;
|
|
|
|
if (cmd == FDGETPRM32)
|
|
|
|
break;
|
|
|
|
err = __get_user(f->size, &uf->size);
|
|
|
|
err |= __get_user(f->sect, &uf->sect);
|
|
|
|
err |= __get_user(f->head, &uf->head);
|
|
|
|
err |= __get_user(f->track, &uf->track);
|
|
|
|
err |= __get_user(f->stretch, &uf->stretch);
|
|
|
|
err |= __get_user(f->gap, &uf->gap);
|
|
|
|
err |= __get_user(f->rate, &uf->rate);
|
|
|
|
err |= __get_user(f->spec1, &uf->spec1);
|
|
|
|
err |= __get_user(f->fmt_gap, &uf->fmt_gap);
|
|
|
|
err |= __get_user(name, &uf->name);
|
|
|
|
f->name = compat_ptr(name);
|
|
|
|
if (err) {
|
|
|
|
err = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case FDSETDRVPRM32:
|
|
|
|
case FDGETDRVPRM32:
|
|
|
|
{
|
|
|
|
struct compat_floppy_drive_params __user *uf;
|
|
|
|
struct floppy_drive_params *f;
|
|
|
|
|
|
|
|
uf = compat_ptr(arg);
|
|
|
|
f = karg = kmalloc(sizeof(struct floppy_drive_params), GFP_KERNEL);
|
|
|
|
if (!karg)
|
|
|
|
return -ENOMEM;
|
|
|
|
if (cmd == FDGETDRVPRM32)
|
|
|
|
break;
|
|
|
|
err = __get_user(f->cmos, &uf->cmos);
|
|
|
|
err |= __get_user(f->max_dtr, &uf->max_dtr);
|
|
|
|
err |= __get_user(f->hlt, &uf->hlt);
|
|
|
|
err |= __get_user(f->hut, &uf->hut);
|
|
|
|
err |= __get_user(f->srt, &uf->srt);
|
|
|
|
err |= __get_user(f->spinup, &uf->spinup);
|
|
|
|
err |= __get_user(f->spindown, &uf->spindown);
|
|
|
|
err |= __get_user(f->spindown_offset, &uf->spindown_offset);
|
|
|
|
err |= __get_user(f->select_delay, &uf->select_delay);
|
|
|
|
err |= __get_user(f->rps, &uf->rps);
|
|
|
|
err |= __get_user(f->tracks, &uf->tracks);
|
|
|
|
err |= __get_user(f->timeout, &uf->timeout);
|
|
|
|
err |= __get_user(f->interleave_sect, &uf->interleave_sect);
|
|
|
|
err |= __copy_from_user(&f->max_errors, &uf->max_errors, sizeof(f->max_errors));
|
|
|
|
err |= __get_user(f->flags, &uf->flags);
|
|
|
|
err |= __get_user(f->read_track, &uf->read_track);
|
|
|
|
err |= __copy_from_user(f->autodetect, uf->autodetect, sizeof(f->autodetect));
|
|
|
|
err |= __get_user(f->checkfreq, &uf->checkfreq);
|
|
|
|
err |= __get_user(f->native_format, &uf->native_format);
|
|
|
|
if (err) {
|
|
|
|
err = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case FDGETDRVSTAT32:
|
|
|
|
case FDPOLLDRVSTAT32:
|
|
|
|
karg = kmalloc(sizeof(struct floppy_drive_struct), GFP_KERNEL);
|
|
|
|
if (!karg)
|
|
|
|
return -ENOMEM;
|
|
|
|
break;
|
|
|
|
case FDGETFDCSTAT32:
|
|
|
|
karg = kmalloc(sizeof(struct floppy_fdc_state), GFP_KERNEL);
|
|
|
|
if (!karg)
|
|
|
|
return -ENOMEM;
|
|
|
|
break;
|
|
|
|
case FDWERRORGET32:
|
|
|
|
karg = kmalloc(sizeof(struct floppy_write_errors), GFP_KERNEL);
|
|
|
|
if (!karg)
|
|
|
|
return -ENOMEM;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
set_fs(KERNEL_DS);
|
2008-02-23 03:02:50 +00:00
|
|
|
err = __blkdev_driver_ioctl(bdev, mode, kcmd, (unsigned long)karg);
|
2007-10-09 11:23:57 +00:00
|
|
|
set_fs(old_fs);
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
switch (cmd) {
|
|
|
|
case FDGETPRM32:
|
|
|
|
{
|
|
|
|
struct floppy_struct *f = karg;
|
|
|
|
struct compat_floppy_struct __user *uf = compat_ptr(arg);
|
|
|
|
|
|
|
|
err = __put_user(f->size, &uf->size);
|
|
|
|
err |= __put_user(f->sect, &uf->sect);
|
|
|
|
err |= __put_user(f->head, &uf->head);
|
|
|
|
err |= __put_user(f->track, &uf->track);
|
|
|
|
err |= __put_user(f->stretch, &uf->stretch);
|
|
|
|
err |= __put_user(f->gap, &uf->gap);
|
|
|
|
err |= __put_user(f->rate, &uf->rate);
|
|
|
|
err |= __put_user(f->spec1, &uf->spec1);
|
|
|
|
err |= __put_user(f->fmt_gap, &uf->fmt_gap);
|
|
|
|
err |= __put_user((u64)f->name, (compat_caddr_t __user *)&uf->name);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case FDGETDRVPRM32:
|
|
|
|
{
|
|
|
|
struct compat_floppy_drive_params __user *uf;
|
|
|
|
struct floppy_drive_params *f = karg;
|
|
|
|
|
|
|
|
uf = compat_ptr(arg);
|
|
|
|
err = __put_user(f->cmos, &uf->cmos);
|
|
|
|
err |= __put_user(f->max_dtr, &uf->max_dtr);
|
|
|
|
err |= __put_user(f->hlt, &uf->hlt);
|
|
|
|
err |= __put_user(f->hut, &uf->hut);
|
|
|
|
err |= __put_user(f->srt, &uf->srt);
|
|
|
|
err |= __put_user(f->spinup, &uf->spinup);
|
|
|
|
err |= __put_user(f->spindown, &uf->spindown);
|
|
|
|
err |= __put_user(f->spindown_offset, &uf->spindown_offset);
|
|
|
|
err |= __put_user(f->select_delay, &uf->select_delay);
|
|
|
|
err |= __put_user(f->rps, &uf->rps);
|
|
|
|
err |= __put_user(f->tracks, &uf->tracks);
|
|
|
|
err |= __put_user(f->timeout, &uf->timeout);
|
|
|
|
err |= __put_user(f->interleave_sect, &uf->interleave_sect);
|
|
|
|
err |= __copy_to_user(&uf->max_errors, &f->max_errors, sizeof(f->max_errors));
|
|
|
|
err |= __put_user(f->flags, &uf->flags);
|
|
|
|
err |= __put_user(f->read_track, &uf->read_track);
|
|
|
|
err |= __copy_to_user(uf->autodetect, f->autodetect, sizeof(f->autodetect));
|
|
|
|
err |= __put_user(f->checkfreq, &uf->checkfreq);
|
|
|
|
err |= __put_user(f->native_format, &uf->native_format);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case FDGETDRVSTAT32:
|
|
|
|
case FDPOLLDRVSTAT32:
|
|
|
|
{
|
|
|
|
struct compat_floppy_drive_struct __user *uf;
|
|
|
|
struct floppy_drive_struct *f = karg;
|
|
|
|
|
|
|
|
uf = compat_ptr(arg);
|
|
|
|
err = __put_user(f->flags, &uf->flags);
|
|
|
|
err |= __put_user(f->spinup_date, &uf->spinup_date);
|
|
|
|
err |= __put_user(f->select_date, &uf->select_date);
|
|
|
|
err |= __put_user(f->first_read_date, &uf->first_read_date);
|
|
|
|
err |= __put_user(f->probed_format, &uf->probed_format);
|
|
|
|
err |= __put_user(f->track, &uf->track);
|
|
|
|
err |= __put_user(f->maxblock, &uf->maxblock);
|
|
|
|
err |= __put_user(f->maxtrack, &uf->maxtrack);
|
|
|
|
err |= __put_user(f->generation, &uf->generation);
|
|
|
|
err |= __put_user(f->keep_data, &uf->keep_data);
|
|
|
|
err |= __put_user(f->fd_ref, &uf->fd_ref);
|
|
|
|
err |= __put_user(f->fd_device, &uf->fd_device);
|
|
|
|
err |= __put_user(f->last_checked, &uf->last_checked);
|
|
|
|
err |= __put_user((u64)f->dmabuf, &uf->dmabuf);
|
|
|
|
err |= __put_user((u64)f->bufblocks, &uf->bufblocks);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case FDGETFDCSTAT32:
|
|
|
|
{
|
|
|
|
struct compat_floppy_fdc_state __user *uf;
|
|
|
|
struct floppy_fdc_state *f = karg;
|
|
|
|
|
|
|
|
uf = compat_ptr(arg);
|
|
|
|
err = __put_user(f->spec1, &uf->spec1);
|
|
|
|
err |= __put_user(f->spec2, &uf->spec2);
|
|
|
|
err |= __put_user(f->dtr, &uf->dtr);
|
|
|
|
err |= __put_user(f->version, &uf->version);
|
|
|
|
err |= __put_user(f->dor, &uf->dor);
|
|
|
|
err |= __put_user(f->address, &uf->address);
|
|
|
|
err |= __copy_to_user((char __user *)&uf->address + sizeof(uf->address),
|
|
|
|
(char *)&f->address + sizeof(f->address), sizeof(int));
|
|
|
|
err |= __put_user(f->driver_version, &uf->driver_version);
|
|
|
|
err |= __copy_to_user(uf->track, f->track, sizeof(f->track));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case FDWERRORGET32:
|
|
|
|
{
|
|
|
|
struct compat_floppy_write_errors __user *uf;
|
|
|
|
struct floppy_write_errors *f = karg;
|
|
|
|
|
|
|
|
uf = compat_ptr(arg);
|
|
|
|
err = __put_user(f->write_errors, &uf->write_errors);
|
|
|
|
err |= __put_user(f->first_error_sector, &uf->first_error_sector);
|
|
|
|
err |= __put_user(f->first_error_generation, &uf->first_error_generation);
|
|
|
|
err |= __put_user(f->last_error_sector, &uf->last_error_sector);
|
|
|
|
err |= __put_user(f->last_error_generation, &uf->last_error_generation);
|
|
|
|
err |= __put_user(f->badness, &uf->badness);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (err)
|
|
|
|
err = -EFAULT;
|
|
|
|
|
|
|
|
out:
|
|
|
|
kfree(karg);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-02-23 03:02:50 +00:00
|
|
|
static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode,
|
|
|
|
unsigned cmd, unsigned long arg)
|
2007-10-09 11:23:52 +00:00
|
|
|
{
|
2007-10-27 11:34:10 +00:00
|
|
|
switch (cmd) {
|
2007-10-09 11:23:55 +00:00
|
|
|
case HDIO_GET_UNMASKINTR:
|
|
|
|
case HDIO_GET_MULTCOUNT:
|
|
|
|
case HDIO_GET_KEEPSETTINGS:
|
|
|
|
case HDIO_GET_32BIT:
|
|
|
|
case HDIO_GET_NOWERR:
|
|
|
|
case HDIO_GET_DMA:
|
|
|
|
case HDIO_GET_NICE:
|
|
|
|
case HDIO_GET_WCACHE:
|
|
|
|
case HDIO_GET_ACOUSTIC:
|
|
|
|
case HDIO_GET_ADDRESS:
|
|
|
|
case HDIO_GET_BUSSTATE:
|
2008-02-23 03:02:50 +00:00
|
|
|
return compat_hdio_ioctl(bdev, mode, cmd, arg);
|
2007-10-09 11:23:57 +00:00
|
|
|
case FDSETPRM32:
|
|
|
|
case FDDEFPRM32:
|
|
|
|
case FDGETPRM32:
|
|
|
|
case FDSETDRVPRM32:
|
|
|
|
case FDGETDRVPRM32:
|
|
|
|
case FDGETDRVSTAT32:
|
|
|
|
case FDPOLLDRVSTAT32:
|
|
|
|
case FDGETFDCSTAT32:
|
|
|
|
case FDWERRORGET32:
|
2008-02-23 03:02:50 +00:00
|
|
|
return compat_fd_ioctl(bdev, mode, cmd, arg);
|
2007-10-09 11:23:56 +00:00
|
|
|
case CDROMREADAUDIO:
|
2008-02-23 03:02:50 +00:00
|
|
|
return compat_cdrom_read_audio(bdev, mode, cmd, arg);
|
2007-10-09 11:23:56 +00:00
|
|
|
case CDROM_SEND_PACKET:
|
2008-02-23 03:02:50 +00:00
|
|
|
return compat_cdrom_generic_command(bdev, mode, cmd, arg);
|
2007-10-09 11:23:56 +00:00
|
|
|
|
2007-10-09 11:23:52 +00:00
|
|
|
/*
|
|
|
|
* No handler required for the ones below, we just need to
|
|
|
|
* convert arg to a 64 bit pointer.
|
|
|
|
*/
|
|
|
|
case BLKSECTSET:
|
|
|
|
/*
|
|
|
|
* 0x03 -- HD/IDE ioctl's used by hdparm and friends.
|
|
|
|
* Some need translations, these do not.
|
|
|
|
*/
|
|
|
|
case HDIO_GET_IDENTITY:
|
|
|
|
case HDIO_DRIVE_TASK:
|
|
|
|
case HDIO_DRIVE_CMD:
|
|
|
|
/* 0x330 is reserved -- it used to be HDIO_GETGEO_BIG */
|
|
|
|
case 0x330:
|
|
|
|
/* 0x02 -- Floppy ioctls */
|
|
|
|
case FDMSGON:
|
|
|
|
case FDMSGOFF:
|
|
|
|
case FDSETEMSGTRESH:
|
|
|
|
case FDFLUSH:
|
|
|
|
case FDWERRORCLR:
|
|
|
|
case FDSETMAXERRS:
|
|
|
|
case FDGETMAXERRS:
|
|
|
|
case FDGETDRVTYP:
|
|
|
|
case FDEJECT:
|
|
|
|
case FDCLRPRM:
|
|
|
|
case FDFMTBEG:
|
|
|
|
case FDFMTEND:
|
|
|
|
case FDRESET:
|
|
|
|
case FDTWADDLE:
|
|
|
|
case FDFMTTRK:
|
|
|
|
case FDRAWCMD:
|
|
|
|
/* CDROM stuff */
|
|
|
|
case CDROMPAUSE:
|
|
|
|
case CDROMRESUME:
|
|
|
|
case CDROMPLAYMSF:
|
|
|
|
case CDROMPLAYTRKIND:
|
|
|
|
case CDROMREADTOCHDR:
|
|
|
|
case CDROMREADTOCENTRY:
|
|
|
|
case CDROMSTOP:
|
|
|
|
case CDROMSTART:
|
|
|
|
case CDROMEJECT:
|
|
|
|
case CDROMVOLCTRL:
|
|
|
|
case CDROMSUBCHNL:
|
|
|
|
case CDROMMULTISESSION:
|
|
|
|
case CDROM_GET_MCN:
|
|
|
|
case CDROMRESET:
|
|
|
|
case CDROMVOLREAD:
|
|
|
|
case CDROMSEEK:
|
|
|
|
case CDROMPLAYBLK:
|
|
|
|
case CDROMCLOSETRAY:
|
|
|
|
case CDROM_DISC_STATUS:
|
|
|
|
case CDROM_CHANGER_NSLOTS:
|
|
|
|
case CDROM_GET_CAPABILITY:
|
|
|
|
/* Ignore cdrom.h about these next 5 ioctls, they absolutely do
|
|
|
|
* not take a struct cdrom_read, instead they take a struct cdrom_msf
|
|
|
|
* which is compatible.
|
|
|
|
*/
|
|
|
|
case CDROMREADMODE2:
|
|
|
|
case CDROMREADMODE1:
|
|
|
|
case CDROMREADRAW:
|
|
|
|
case CDROMREADCOOKED:
|
|
|
|
case CDROMREADALL:
|
|
|
|
/* DVD ioctls */
|
|
|
|
case DVD_READ_STRUCT:
|
|
|
|
case DVD_WRITE_STRUCT:
|
|
|
|
case DVD_AUTH:
|
|
|
|
arg = (unsigned long)compat_ptr(arg);
|
2008-10-31 21:39:46 +00:00
|
|
|
/* These intepret arg as an unsigned long, not as a pointer,
|
|
|
|
* so we must not do compat_ptr() conversion. */
|
|
|
|
case HDIO_SET_MULTCOUNT:
|
|
|
|
case HDIO_SET_UNMASKINTR:
|
|
|
|
case HDIO_SET_KEEPSETTINGS:
|
|
|
|
case HDIO_SET_32BIT:
|
|
|
|
case HDIO_SET_NOWERR:
|
|
|
|
case HDIO_SET_DMA:
|
|
|
|
case HDIO_SET_PIO_MODE:
|
|
|
|
case HDIO_SET_NICE:
|
|
|
|
case HDIO_SET_WCACHE:
|
|
|
|
case HDIO_SET_ACOUSTIC:
|
|
|
|
case HDIO_SET_BUSSTATE:
|
|
|
|
case HDIO_SET_ADDRESS:
|
|
|
|
case CDROMEJECT_SW:
|
|
|
|
case CDROM_SET_OPTIONS:
|
|
|
|
case CDROM_CLEAR_OPTIONS:
|
|
|
|
case CDROM_SELECT_SPEED:
|
|
|
|
case CDROM_SELECT_DISC:
|
|
|
|
case CDROM_MEDIA_CHANGED:
|
|
|
|
case CDROM_DRIVE_STATUS:
|
|
|
|
case CDROM_LOCKDOOR:
|
|
|
|
case CDROM_DEBUG:
|
2007-10-09 11:23:52 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* unknown ioctl number */
|
|
|
|
return -ENOIOCTLCMD;
|
|
|
|
}
|
|
|
|
|
2008-02-23 03:02:50 +00:00
|
|
|
return __blkdev_driver_ioctl(bdev, mode, cmd, arg);
|
2007-10-09 11:23:52 +00:00
|
|
|
}
|
|
|
|
|
2008-09-18 19:53:24 +00:00
|
|
|
/* Most of the generic ioctls are handled in the normal fallback path.
|
|
|
|
This assumes the blkdev's low level compat_ioctl always returns
|
|
|
|
ENOIOCTLCMD for unknown ioctls. */
|
|
|
|
long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
|
2007-10-09 11:23:51 +00:00
|
|
|
{
|
2008-09-18 19:53:24 +00:00
|
|
|
int ret = -ENOIOCTLCMD;
|
|
|
|
struct inode *inode = file->f_mapping->host;
|
|
|
|
struct block_device *bdev = inode->i_bdev;
|
|
|
|
struct gendisk *disk = bdev->bd_disk;
|
|
|
|
fmode_t mode = file->f_mode;
|
2007-10-09 11:23:51 +00:00
|
|
|
struct backing_dev_info *bdi;
|
2008-09-18 19:53:24 +00:00
|
|
|
loff_t size;
|
2014-05-25 12:43:33 +00:00
|
|
|
unsigned int max_sectors;
|
2008-09-18 19:53:24 +00:00
|
|
|
|
2008-11-05 13:58:42 +00:00
|
|
|
/*
|
|
|
|
* O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have
|
|
|
|
* to updated it before every ioctl.
|
|
|
|
*/
|
2008-09-18 19:53:24 +00:00
|
|
|
if (file->f_flags & O_NDELAY)
|
2008-11-05 13:58:42 +00:00
|
|
|
mode |= FMODE_NDELAY;
|
|
|
|
else
|
|
|
|
mode &= ~FMODE_NDELAY;
|
2007-10-09 11:23:51 +00:00
|
|
|
|
|
|
|
switch (cmd) {
|
2008-09-18 19:53:24 +00:00
|
|
|
case HDIO_GETGEO:
|
|
|
|
return compat_hdio_getgeo(disk, bdev, compat_ptr(arg));
|
2009-10-03 18:52:01 +00:00
|
|
|
case BLKPBSZGET:
|
|
|
|
return compat_put_uint(arg, bdev_physical_block_size(bdev));
|
|
|
|
case BLKIOMIN:
|
|
|
|
return compat_put_uint(arg, bdev_io_min(bdev));
|
|
|
|
case BLKIOOPT:
|
|
|
|
return compat_put_uint(arg, bdev_io_opt(bdev));
|
|
|
|
case BLKALIGNOFF:
|
|
|
|
return compat_put_int(arg, bdev_alignment_offset(bdev));
|
2009-12-03 08:24:48 +00:00
|
|
|
case BLKDISCARDZEROES:
|
|
|
|
return compat_put_uint(arg, bdev_discard_zeroes_data(bdev));
|
2008-09-18 19:53:24 +00:00
|
|
|
case BLKFLSBUF:
|
|
|
|
case BLKROSET:
|
|
|
|
case BLKDISCARD:
|
2010-08-11 21:17:49 +00:00
|
|
|
case BLKSECDISCARD:
|
2014-07-02 16:46:23 +00:00
|
|
|
case BLKZEROOUT:
|
2008-09-18 19:53:24 +00:00
|
|
|
/*
|
|
|
|
* the ones below are implemented in blkdev_locked_ioctl,
|
|
|
|
* but we call blkdev_ioctl, which gets the lock for us
|
|
|
|
*/
|
|
|
|
case BLKRRPART:
|
2008-09-19 07:17:36 +00:00
|
|
|
return blkdev_ioctl(bdev, mode, cmd,
|
2008-09-18 19:53:24 +00:00
|
|
|
(unsigned long)compat_ptr(arg));
|
|
|
|
case BLKBSZSET_32:
|
2008-09-19 07:17:36 +00:00
|
|
|
return blkdev_ioctl(bdev, mode, BLKBSZSET,
|
2008-09-18 19:53:24 +00:00
|
|
|
(unsigned long)compat_ptr(arg));
|
|
|
|
case BLKPG:
|
2008-09-19 07:17:36 +00:00
|
|
|
return compat_blkpg_ioctl(bdev, mode, cmd, compat_ptr(arg));
|
2007-10-09 11:23:51 +00:00
|
|
|
case BLKRAGET:
|
|
|
|
case BLKFRAGET:
|
|
|
|
if (!arg)
|
|
|
|
return -EINVAL;
|
|
|
|
bdi = blk_get_backing_dev_info(bdev);
|
|
|
|
return compat_put_long(arg,
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 12:29:47 +00:00
|
|
|
(bdi->ra_pages * PAGE_SIZE) / 512);
|
2007-10-09 11:23:51 +00:00
|
|
|
case BLKROGET: /* compatible */
|
|
|
|
return compat_put_int(arg, bdev_read_only(bdev) != 0);
|
|
|
|
case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */
|
|
|
|
return compat_put_int(arg, block_size(bdev));
|
|
|
|
case BLKSSZGET: /* get block device hardware sector size */
|
2009-05-22 21:17:49 +00:00
|
|
|
return compat_put_int(arg, bdev_logical_block_size(bdev));
|
2007-10-09 11:23:51 +00:00
|
|
|
case BLKSECTGET:
|
2014-05-25 12:43:33 +00:00
|
|
|
max_sectors = min_t(unsigned int, USHRT_MAX,
|
|
|
|
queue_max_sectors(bdev_get_queue(bdev)));
|
|
|
|
return compat_put_ushort(arg, max_sectors);
|
2012-01-11 15:29:31 +00:00
|
|
|
case BLKROTATIONAL:
|
|
|
|
return compat_put_ushort(arg,
|
|
|
|
!blk_queue_nonrot(bdev_get_queue(bdev)));
|
2007-10-09 11:23:51 +00:00
|
|
|
case BLKRASET: /* compatible, but no compat_ptr (!) */
|
|
|
|
case BLKFRASET:
|
|
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
|
|
return -EACCES;
|
|
|
|
bdi = blk_get_backing_dev_info(bdev);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 12:29:47 +00:00
|
|
|
bdi->ra_pages = (arg * 512) / PAGE_SIZE;
|
2007-10-09 11:23:51 +00:00
|
|
|
return 0;
|
|
|
|
case BLKGETSIZE:
|
2010-11-08 13:39:12 +00:00
|
|
|
size = i_size_read(bdev->bd_inode);
|
2008-09-18 19:53:24 +00:00
|
|
|
if ((size >> 9) > ~0UL)
|
2007-10-09 11:23:51 +00:00
|
|
|
return -EFBIG;
|
2008-09-18 19:53:24 +00:00
|
|
|
return compat_put_ulong(arg, size >> 9);
|
2007-10-09 11:23:51 +00:00
|
|
|
|
|
|
|
case BLKGETSIZE64_32:
|
2010-11-08 13:39:12 +00:00
|
|
|
return compat_put_u64(arg, i_size_read(bdev->bd_inode));
|
2007-10-09 11:23:53 +00:00
|
|
|
|
|
|
|
case BLKTRACESETUP32:
|
|
|
|
case BLKTRACESTART: /* compatible */
|
|
|
|
case BLKTRACESTOP: /* compatible */
|
|
|
|
case BLKTRACETEARDOWN: /* compatible */
|
2008-09-18 19:53:24 +00:00
|
|
|
ret = blk_trace_ioctl(bdev, cmd, compat_ptr(arg));
|
2007-10-09 11:23:52 +00:00
|
|
|
return ret;
|
2008-09-18 19:53:24 +00:00
|
|
|
default:
|
|
|
|
if (disk->fops->compat_ioctl)
|
|
|
|
ret = disk->fops->compat_ioctl(bdev, mode, cmd, arg);
|
|
|
|
if (ret == -ENOIOCTLCMD)
|
|
|
|
ret = compat_blkdev_driver_ioctl(bdev, mode, cmd, arg);
|
|
|
|
return ret;
|
|
|
|
}
|
2007-10-09 11:23:51 +00:00
|
|
|
}
|