![Tejun Heo](/assets/img/avatar_default.png)
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>
311 lines
6.9 KiB
C
311 lines
6.9 KiB
C
/*
|
|
* file.c
|
|
*
|
|
* Copyright (C) 1995, 1996 by Volker Lendecke
|
|
* Modified 1997 Peter Waltenberg, Bill Hawes, David Woodhouse for 2.1 dcache
|
|
*
|
|
*/
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <asm/system.h>
|
|
|
|
#include <linux/time.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/smp_lock.h>
|
|
|
|
#include <linux/ncp_fs.h>
|
|
#include "ncplib_kernel.h"
|
|
|
|
static int ncp_fsync(struct file *file, struct dentry *dentry, int datasync)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Open a file with the specified read/write mode.
|
|
*/
|
|
int ncp_make_open(struct inode *inode, int right)
|
|
{
|
|
int error;
|
|
int access;
|
|
|
|
error = -EINVAL;
|
|
if (!inode) {
|
|
printk(KERN_ERR "ncp_make_open: got NULL inode\n");
|
|
goto out;
|
|
}
|
|
|
|
DPRINTK("ncp_make_open: opened=%d, volume # %u, dir entry # %u\n",
|
|
atomic_read(&NCP_FINFO(inode)->opened),
|
|
NCP_FINFO(inode)->volNumber,
|
|
NCP_FINFO(inode)->dirEntNum);
|
|
error = -EACCES;
|
|
mutex_lock(&NCP_FINFO(inode)->open_mutex);
|
|
if (!atomic_read(&NCP_FINFO(inode)->opened)) {
|
|
struct ncp_entry_info finfo;
|
|
int result;
|
|
|
|
/* tries max. rights */
|
|
finfo.access = O_RDWR;
|
|
result = ncp_open_create_file_or_subdir(NCP_SERVER(inode),
|
|
inode, NULL, OC_MODE_OPEN,
|
|
0, AR_READ | AR_WRITE, &finfo);
|
|
if (!result)
|
|
goto update;
|
|
/* RDWR did not succeeded, try readonly or writeonly as requested */
|
|
switch (right) {
|
|
case O_RDONLY:
|
|
finfo.access = O_RDONLY;
|
|
result = ncp_open_create_file_or_subdir(NCP_SERVER(inode),
|
|
inode, NULL, OC_MODE_OPEN,
|
|
0, AR_READ, &finfo);
|
|
break;
|
|
case O_WRONLY:
|
|
finfo.access = O_WRONLY;
|
|
result = ncp_open_create_file_or_subdir(NCP_SERVER(inode),
|
|
inode, NULL, OC_MODE_OPEN,
|
|
0, AR_WRITE, &finfo);
|
|
break;
|
|
}
|
|
if (result) {
|
|
PPRINTK("ncp_make_open: failed, result=%d\n", result);
|
|
goto out_unlock;
|
|
}
|
|
/*
|
|
* Update the inode information.
|
|
*/
|
|
update:
|
|
ncp_update_inode(inode, &finfo);
|
|
atomic_set(&NCP_FINFO(inode)->opened, 1);
|
|
}
|
|
|
|
access = NCP_FINFO(inode)->access;
|
|
PPRINTK("ncp_make_open: file open, access=%x\n", access);
|
|
if (access == right || access == O_RDWR) {
|
|
atomic_inc(&NCP_FINFO(inode)->opened);
|
|
error = 0;
|
|
}
|
|
|
|
out_unlock:
|
|
mutex_unlock(&NCP_FINFO(inode)->open_mutex);
|
|
out:
|
|
return error;
|
|
}
|
|
|
|
static ssize_t
|
|
ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
|
|
{
|
|
struct dentry *dentry = file->f_path.dentry;
|
|
struct inode *inode = dentry->d_inode;
|
|
size_t already_read = 0;
|
|
off_t pos;
|
|
size_t bufsize;
|
|
int error;
|
|
void* freepage;
|
|
size_t freelen;
|
|
|
|
DPRINTK("ncp_file_read: enter %s/%s\n",
|
|
dentry->d_parent->d_name.name, dentry->d_name.name);
|
|
|
|
if (!ncp_conn_valid(NCP_SERVER(inode)))
|
|
return -EIO;
|
|
|
|
pos = *ppos;
|
|
|
|
if ((ssize_t) count < 0) {
|
|
return -EINVAL;
|
|
}
|
|
if (!count)
|
|
return 0;
|
|
if (pos > inode->i_sb->s_maxbytes)
|
|
return 0;
|
|
if (pos + count > inode->i_sb->s_maxbytes) {
|
|
count = inode->i_sb->s_maxbytes - pos;
|
|
}
|
|
|
|
error = ncp_make_open(inode, O_RDONLY);
|
|
if (error) {
|
|
DPRINTK(KERN_ERR "ncp_file_read: open failed, error=%d\n", error);
|
|
return error;
|
|
}
|
|
|
|
bufsize = NCP_SERVER(inode)->buffer_size;
|
|
|
|
error = -EIO;
|
|
freelen = ncp_read_bounce_size(bufsize);
|
|
freepage = vmalloc(freelen);
|
|
if (!freepage)
|
|
goto outrel;
|
|
error = 0;
|
|
/* First read in as much as possible for each bufsize. */
|
|
while (already_read < count) {
|
|
int read_this_time;
|
|
size_t to_read = min_t(unsigned int,
|
|
bufsize - (pos % bufsize),
|
|
count - already_read);
|
|
|
|
error = ncp_read_bounce(NCP_SERVER(inode),
|
|
NCP_FINFO(inode)->file_handle,
|
|
pos, to_read, buf, &read_this_time,
|
|
freepage, freelen);
|
|
if (error) {
|
|
error = -EIO; /* NW errno -> Linux errno */
|
|
break;
|
|
}
|
|
pos += read_this_time;
|
|
buf += read_this_time;
|
|
already_read += read_this_time;
|
|
|
|
if (read_this_time != to_read) {
|
|
break;
|
|
}
|
|
}
|
|
vfree(freepage);
|
|
|
|
*ppos = pos;
|
|
|
|
file_accessed(file);
|
|
|
|
DPRINTK("ncp_file_read: exit %s/%s\n",
|
|
dentry->d_parent->d_name.name, dentry->d_name.name);
|
|
outrel:
|
|
ncp_inode_close(inode);
|
|
return already_read ? already_read : error;
|
|
}
|
|
|
|
static ssize_t
|
|
ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
|
|
{
|
|
struct dentry *dentry = file->f_path.dentry;
|
|
struct inode *inode = dentry->d_inode;
|
|
size_t already_written = 0;
|
|
off_t pos;
|
|
size_t bufsize;
|
|
int errno;
|
|
void* bouncebuffer;
|
|
|
|
DPRINTK("ncp_file_write: enter %s/%s\n",
|
|
dentry->d_parent->d_name.name, dentry->d_name.name);
|
|
if (!ncp_conn_valid(NCP_SERVER(inode)))
|
|
return -EIO;
|
|
if ((ssize_t) count < 0)
|
|
return -EINVAL;
|
|
pos = *ppos;
|
|
if (file->f_flags & O_APPEND) {
|
|
pos = inode->i_size;
|
|
}
|
|
|
|
if (pos + count > MAX_NON_LFS && !(file->f_flags&O_LARGEFILE)) {
|
|
if (pos >= MAX_NON_LFS) {
|
|
return -EFBIG;
|
|
}
|
|
if (count > MAX_NON_LFS - (u32)pos) {
|
|
count = MAX_NON_LFS - (u32)pos;
|
|
}
|
|
}
|
|
if (pos >= inode->i_sb->s_maxbytes) {
|
|
if (count || pos > inode->i_sb->s_maxbytes) {
|
|
return -EFBIG;
|
|
}
|
|
}
|
|
if (pos + count > inode->i_sb->s_maxbytes) {
|
|
count = inode->i_sb->s_maxbytes - pos;
|
|
}
|
|
|
|
if (!count)
|
|
return 0;
|
|
errno = ncp_make_open(inode, O_WRONLY);
|
|
if (errno) {
|
|
DPRINTK(KERN_ERR "ncp_file_write: open failed, error=%d\n", errno);
|
|
return errno;
|
|
}
|
|
bufsize = NCP_SERVER(inode)->buffer_size;
|
|
|
|
already_written = 0;
|
|
|
|
bouncebuffer = vmalloc(bufsize);
|
|
if (!bouncebuffer) {
|
|
errno = -EIO; /* -ENOMEM */
|
|
goto outrel;
|
|
}
|
|
while (already_written < count) {
|
|
int written_this_time;
|
|
size_t to_write = min_t(unsigned int,
|
|
bufsize - (pos % bufsize),
|
|
count - already_written);
|
|
|
|
if (copy_from_user(bouncebuffer, buf, to_write)) {
|
|
errno = -EFAULT;
|
|
break;
|
|
}
|
|
if (ncp_write_kernel(NCP_SERVER(inode),
|
|
NCP_FINFO(inode)->file_handle,
|
|
pos, to_write, bouncebuffer, &written_this_time) != 0) {
|
|
errno = -EIO;
|
|
break;
|
|
}
|
|
pos += written_this_time;
|
|
buf += written_this_time;
|
|
already_written += written_this_time;
|
|
|
|
if (written_this_time != to_write) {
|
|
break;
|
|
}
|
|
}
|
|
vfree(bouncebuffer);
|
|
|
|
file_update_time(file);
|
|
|
|
*ppos = pos;
|
|
|
|
if (pos > inode->i_size) {
|
|
inode->i_size = pos;
|
|
}
|
|
DPRINTK("ncp_file_write: exit %s/%s\n",
|
|
dentry->d_parent->d_name.name, dentry->d_name.name);
|
|
outrel:
|
|
ncp_inode_close(inode);
|
|
return already_written ? already_written : errno;
|
|
}
|
|
|
|
static int ncp_release(struct inode *inode, struct file *file) {
|
|
if (ncp_make_closed(inode)) {
|
|
DPRINTK("ncp_release: failed to close\n");
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static loff_t ncp_remote_llseek(struct file *file, loff_t offset, int origin)
|
|
{
|
|
loff_t ret;
|
|
lock_kernel();
|
|
ret = generic_file_llseek_unlocked(file, offset, origin);
|
|
unlock_kernel();
|
|
return ret;
|
|
}
|
|
|
|
const struct file_operations ncp_file_operations =
|
|
{
|
|
.llseek = ncp_remote_llseek,
|
|
.read = ncp_file_read,
|
|
.write = ncp_file_write,
|
|
.ioctl = ncp_ioctl,
|
|
#ifdef CONFIG_COMPAT
|
|
.compat_ioctl = ncp_compat_ioctl,
|
|
#endif
|
|
.mmap = ncp_mmap,
|
|
.release = ncp_release,
|
|
.fsync = ncp_fsync,
|
|
};
|
|
|
|
const struct inode_operations ncp_file_inode_operations =
|
|
{
|
|
.setattr = ncp_notify_change,
|
|
};
|