e8edc6e03a
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>
109 lines
2.5 KiB
C
109 lines
2.5 KiB
C
/*
|
|
* linux/fs/9p/vfs_addr.c
|
|
*
|
|
* This file contians vfs address (mmap) ops for 9P2000.
|
|
*
|
|
* Copyright (C) 2005 by Eric Van Hensbergen <ericvh@gmail.com>
|
|
* Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to:
|
|
* Free Software Foundation
|
|
* 51 Franklin Street, Fifth Floor
|
|
* Boston, MA 02111-1301 USA
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/file.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/string.h>
|
|
#include <linux/inet.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/sched.h>
|
|
|
|
#include "debug.h"
|
|
#include "v9fs.h"
|
|
#include "9p.h"
|
|
#include "v9fs_vfs.h"
|
|
#include "fid.h"
|
|
|
|
/**
|
|
* v9fs_vfs_readpage - read an entire page in from 9P
|
|
*
|
|
* @file: file being read
|
|
* @page: structure to page
|
|
*
|
|
*/
|
|
|
|
static int v9fs_vfs_readpage(struct file *filp, struct page *page)
|
|
{
|
|
char *buffer = NULL;
|
|
int retval = -EIO;
|
|
loff_t offset = page_offset(page);
|
|
int count = PAGE_CACHE_SIZE;
|
|
struct inode *inode = filp->f_path.dentry->d_inode;
|
|
struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);
|
|
int rsize = v9ses->maxdata - V9FS_IOHDRSZ;
|
|
struct v9fs_fid *v9f = filp->private_data;
|
|
struct v9fs_fcall *fcall = NULL;
|
|
int fid = v9f->fid;
|
|
int total = 0;
|
|
int result = 0;
|
|
|
|
dprintk(DEBUG_VFS, "\n");
|
|
|
|
buffer = kmap(page);
|
|
do {
|
|
if (count < rsize)
|
|
rsize = count;
|
|
|
|
result = v9fs_t_read(v9ses, fid, offset, rsize, &fcall);
|
|
|
|
if (result < 0) {
|
|
printk(KERN_ERR "v9fs_t_read returned %d\n",
|
|
result);
|
|
|
|
kfree(fcall);
|
|
goto UnmapAndUnlock;
|
|
} else
|
|
offset += result;
|
|
|
|
memcpy(buffer, fcall->params.rread.data, result);
|
|
|
|
count -= result;
|
|
buffer += result;
|
|
total += result;
|
|
|
|
kfree(fcall);
|
|
|
|
if (result < rsize)
|
|
break;
|
|
} while (count);
|
|
|
|
memset(buffer, 0, count);
|
|
flush_dcache_page(page);
|
|
SetPageUptodate(page);
|
|
retval = 0;
|
|
|
|
UnmapAndUnlock:
|
|
kunmap(page);
|
|
unlock_page(page);
|
|
return retval;
|
|
}
|
|
|
|
const struct address_space_operations v9fs_addr_operations = {
|
|
.readpage = v9fs_vfs_readpage,
|
|
};
|