[XFS] kill move.[ch]
Kill uio related functions and defines now that they're unused. SGI-PV: 968563 SGI-Modid: xfs-linux-melb:xfs-kern:29480a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Christoph Hellwig
Tim Shimmin
Родитель
804c83c376
Коммит
39cd9f877e
|
|
@ -114,7 +114,6 @@ xfs-y += $(addprefix $(XFS_LINUX)/, \
|
||||||
# Objects in support/
|
# Objects in support/
|
||||||
xfs-y += $(addprefix support/, \
|
xfs-y += $(addprefix support/, \
|
||||||
debug.o \
|
debug.o \
|
||||||
move.o \
|
|
||||||
uuid.o)
|
uuid.o)
|
||||||
|
|
||||||
xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o
|
xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@
|
||||||
|
|
||||||
#include <support/ktrace.h>
|
#include <support/ktrace.h>
|
||||||
#include <support/debug.h>
|
#include <support/debug.h>
|
||||||
#include <support/move.h>
|
|
||||||
#include <support/uuid.h>
|
#include <support/uuid.h>
|
||||||
|
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
|
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
|
|
||||||
* All Rights Reserved.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it would 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 the Free Software Foundation,
|
|
||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
#include <xfs.h>
|
|
||||||
|
|
||||||
/* Read from kernel buffer at src to user/kernel buffer defined
|
|
||||||
* by the uio structure. Advance the pointer in the uio struct
|
|
||||||
* as we go.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
xfs_uio_read(caddr_t src, size_t len, struct uio *uio)
|
|
||||||
{
|
|
||||||
size_t count;
|
|
||||||
|
|
||||||
if (!len || !uio->uio_resid)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
count = uio->uio_iov->iov_len;
|
|
||||||
if (!count)
|
|
||||||
return 0;
|
|
||||||
if (count > len)
|
|
||||||
count = len;
|
|
||||||
|
|
||||||
if (uio->uio_segflg == UIO_USERSPACE) {
|
|
||||||
if (copy_to_user(uio->uio_iov->iov_base, src, count))
|
|
||||||
return EFAULT;
|
|
||||||
} else {
|
|
||||||
ASSERT(uio->uio_segflg == UIO_SYSSPACE);
|
|
||||||
memcpy(uio->uio_iov->iov_base, src, count);
|
|
||||||
}
|
|
||||||
|
|
||||||
uio->uio_iov->iov_base = (void*)((char*)uio->uio_iov->iov_base + count);
|
|
||||||
uio->uio_iov->iov_len -= count;
|
|
||||||
uio->uio_offset += count;
|
|
||||||
uio->uio_resid -= count;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
@ -1,70 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
|
|
||||||
* All Rights Reserved.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it would 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 the Free Software Foundation,
|
|
||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*
|
|
||||||
* Portions Copyright (c) 1982, 1986, 1993, 1994
|
|
||||||
* The Regents of the University of California. All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* 3. Neither the name of the University nor the names of its contributors
|
|
||||||
* may be used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
#ifndef __XFS_SUPPORT_MOVE_H__
|
|
||||||
#define __XFS_SUPPORT_MOVE_H__
|
|
||||||
|
|
||||||
#include <linux/uio.h>
|
|
||||||
#include <asm/uaccess.h>
|
|
||||||
|
|
||||||
/* Segment flag values. */
|
|
||||||
enum uio_seg {
|
|
||||||
UIO_USERSPACE, /* from user data space */
|
|
||||||
UIO_SYSSPACE, /* from system space */
|
|
||||||
};
|
|
||||||
|
|
||||||
struct uio {
|
|
||||||
struct kvec *uio_iov; /* pointer to array of iovecs */
|
|
||||||
int uio_iovcnt; /* number of iovecs in array */
|
|
||||||
xfs_off_t uio_offset; /* offset in file this uio corresponds to */
|
|
||||||
int uio_resid; /* residual i/o count */
|
|
||||||
enum uio_seg uio_segflg; /* see above */
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct uio uio_t;
|
|
||||||
typedef struct kvec iovec_t;
|
|
||||||
|
|
||||||
extern int xfs_uio_read (caddr_t, size_t, uio_t *);
|
|
||||||
|
|
||||||
#endif /* __XFS_SUPPORT_MOVE_H__ */
|
|
||||||
Загрузка…
Ссылка в новой задаче