[PATCH] v9fs: add readpage support (147b31cf) · Commits · 戴 / test

fs/9p/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ obj-$(CONFIG_9P_FS) := 9p2000.o
		conv.o \
		vfs_super.o \
		vfs_inode.o \
		vfs_addr.o \
		vfs_file.o \
		vfs_dir.o \
		vfs_dentry.o \

fs/9p/v9fs_vfs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		*/

		extern struct file_system_type v9fs_fs_type;
		extern struct address_space_operations v9fs_addr_operations;
		extern struct file_operations v9fs_file_operations;
		extern struct file_operations v9fs_dir_operations;
		extern struct dentry_operations v9fs_dentry_operations;

fs/9p/vfs_addr.c

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		/*
		* 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 as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* 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/smp_lock.h>
		#include <linux/inet.h>
		#include <linux/version.h>
		#include <linux/pagemap.h>
		#include <linux/idr.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_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;

		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;
		}

		struct address_space_operations v9fs_addr_operations = {
		.readpage = v9fs_vfs_readpage,
		};

fs/9p/vfs_file.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,9 @@ v9fs_file_write(struct file filp, const char __user data,
		total += result;
		} while (count);

		if(inode->i_mapping->nrpages)
		invalidate_inode_pages2(inode->i_mapping);

		return total;
		}

		@@ -299,4 +302,5 @@ struct file_operations v9fs_file_operations = {
		.open = v9fs_file_open,
		.release = v9fs_dir_release,
		.lock = v9fs_file_lock,
		.mmap = generic_file_mmap,
		};

fs/9p/vfs_inode.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,7 @@ struct inode v9fs_get_inode(struct super_block sb, int mode)
		inode->i_blocks = 0;
		inode->i_rdev = 0;
		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
		inode->i_mapping->a_ops = &v9fs_addr_operations;

		switch (mode & S_IFMT) {
		case S_IFIFO:

Admin message