Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/hch/xfs-2.6 (254feb88) · Commits · e / devices / android_kernel_teracube_emerald

fs/xfs/linux-2.6/xfs_aops.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -886,7 +886,6 @@ xfs_page_state_convert(
		SetPageUptodate(page);

		if (startio) {
		WARN_ON(page_dirty);
		xfs_submit_page(page, wbc, bh_arr, cnt, 0, !page_dirty);
		}

fs/xfs/linux-2.6/xfs_file.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -565,7 +565,7 @@ struct file_operations linvfs_file_operations = {
		.sendfile = linvfs_sendfile,
		.unlocked_ioctl = linvfs_ioctl,
		#ifdef CONFIG_COMPAT
		.compat_ioctl = xfs_compat_ioctl,
		.compat_ioctl = linvfs_compat_ioctl,
		#endif
		.mmap = linvfs_file_mmap,
		.open = linvfs_open,
		@@ -587,7 +587,7 @@ struct file_operations linvfs_invis_file_operations = {
		.sendfile = linvfs_sendfile,
		.unlocked_ioctl = linvfs_ioctl_invis,
		#ifdef CONFIG_COMPAT
		.compat_ioctl = xfs_compat_invis_ioctl,
		.compat_ioctl = linvfs_compat_invis_ioctl,
		#endif
		.mmap = linvfs_file_mmap,
		.open = linvfs_open,
		@@ -600,6 +600,9 @@ struct file_operations linvfs_dir_operations = {
		.read = generic_read_dir,
		.readdir = linvfs_readdir,
		.unlocked_ioctl = linvfs_ioctl,
		#ifdef CONFIG_COMPAT
		.compat_ioctl = linvfs_compat_ioctl,
		#endif
		.fsync = linvfs_fsync,
		};

fs/xfs/linux-2.6/xfs_ioctl32.c

+19 −10

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2004 Silicon Graphics, Inc. All Rights Reserved.
		* Copyright (c) 2004-2005 Silicon Graphics, Inc. All Rights Reserved.
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of version 2 of the GNU General Public License as
		@@ -58,8 +58,9 @@ typedef struct xfs_fsop_bulkreq32 {
		__s32 ocount; /* output count pointer */
		} xfs_fsop_bulkreq32_t;

		static unsigned long
		xfs_ioctl32_bulkstat(unsigned long arg)
		STATIC unsigned long
		xfs_ioctl32_bulkstat(
		unsigned long arg)
		{
		xfs_fsop_bulkreq32_t __user p32 = (void __user )arg;
		xfs_fsop_bulkreq_t __user p = compat_alloc_user_space(sizeof(p));
		@@ -78,8 +79,8 @@ xfs_ioctl32_bulkstat(unsigned long arg)
		}
		#endif

		static long
		__xfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg)
		STATIC long
		__linvfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg)
		{
		int error;
		struct inode *inode = f->f_dentry->d_inode;
		@@ -152,12 +153,20 @@ __xfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg)
		return error;
		}

		long xfs_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg)
		long
		linvfs_compat_ioctl(
		struct file *f,
		unsigned cmd,
		unsigned long arg)
		{
		return __xfs_compat_ioctl(0, f, cmd, arg);
		return __linvfs_compat_ioctl(0, f, cmd, arg);
		}

		long xfs_compat_invis_ioctl(struct file *f, unsigned cmd, unsigned long arg)
		long
		linvfs_compat_invis_ioctl(
		struct file *f,
		unsigned cmd,
		unsigned long arg)
		{
		return __xfs_compat_ioctl(IO_INVIS, f, cmd, arg);
		return __linvfs_compat_ioctl(IO_INVIS, f, cmd, arg);
		}

fs/xfs/linux-2.6/xfs_ioctl32.h

+3 −3

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2004 Silicon Graphics, Inc. All Rights Reserved.
		* Copyright (c) 2004-2005 Silicon Graphics, Inc. All Rights Reserved.
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of version 2 of the GNU General Public License as
		@@ -30,5 +30,5 @@
		* http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
		*/

		long xfs_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
		long xfs_compat_invis_ioctl(struct file *f, unsigned cmd, unsigned long arg);
		long linvfs_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
		long linvfs_compat_invis_ioctl(struct file *f, unsigned cmd, unsigned long arg);

fs/xfs/linux-2.6/xfs_super.c

+1 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved.
		* Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved.
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of version 2 of the GNU General Public License as
		@@ -66,7 +66,6 @@
		#include "xfs_buf_item.h"
		#include "xfs_utils.h"
		#include "xfs_version.h"
		#include "xfs_ioctl32.h"

		#include <linux/namei.h>
		#include <linux/init.h>