[PATCH, mainline-only] remove sendfile leftovers

[PATCH, mainline-only] remove sendfile leftovers

[Christoph Hellwig]

Remove the last sendfile leftovers in mainline.  This code is already
gone in CVS.


Signed-off-by: Christoph Hellwig <hch@lst.de>

diff -uNr -Xdontdiff -p linux-2.6/fs/xfs/linux-2.6/xfs_lrw.h linux-2.6-xfs/fs/xfs/linux-2.6/xfs_lrw.h
--- linux-2.6/fs/xfs/linux-2.6/xfs_lrw.h	2008-02-08 05:19:59.000000000 +0100
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_lrw.h	2007-10-31 15:08:27.000000000 +0100
@@ -50,7 +50,6 @@ struct xfs_iomap;
 #define	XFS_INVAL_CACHED	18
 #define	XFS_DIORD_ENTER		19
 #define	XFS_DIOWR_ENTER		20
-#define	XFS_SENDFILE_ENTER	21
 #define	XFS_WRITEPAGE_ENTER	22
 #define	XFS_RELEASEPAGE_ENTER	23
 #define	XFS_INVALIDPAGE_ENTER	24
diff -uNr -Xdontdiff -p linux-2.6/fs/xfs/xfs_vnodeops.h linux-2.6-xfs/fs/xfs/xfs_vnodeops.h
--- linux-2.6/fs/xfs/xfs_vnodeops.h	2008-02-08 05:19:59.000000000 +0100
+++ linux-2.6-xfs/fs/xfs/xfs_vnodeops.h	2008-02-08 05:20:52.000000000 +0100
@@ -60,9 +60,6 @@ int xfs_ioctl(struct xfs_inode *ip, stru
 ssize_t xfs_read(struct xfs_inode *ip, struct kiocb *iocb,
 		const struct iovec *iovp, unsigned int segs,
 		loff_t *offset, int ioflags);
-ssize_t xfs_sendfile(struct xfs_inode *ip, struct file *filp,
-		loff_t *offset, int ioflags, size_t count,
-		read_actor_t actor, void *target);
 ssize_t xfs_splice_read(struct xfs_inode *ip, struct file *infilp,
 		loff_t *ppos, struct pipe_inode_info *pipe, size_t count,
 		int flags, int ioflags);

Re: [PATCH, mainline-only] remove sendfile leftovers

[Christoph Hellwig]

On Fri, Feb 08, 2008 at 05:42:57AM +0100, Christoph Hellwig wrote:
> Remove the last sendfile leftovers in mainline.  This code is already
> gone in CVS.

Any chance to pass on these three no-risk mainline-only patches to
Linus?  I'm pretty sure they'll get lost otherwise until the next
merge window..

Re: [PATCH, mainline-only] remove sendfile leftovers

[Mark Goodwin]

Christoph Hellwig wrote:
> On Fri, Feb 08, 2008 at 05:42:57AM +0100, Christoph Hellwig wrote:
>> Remove the last sendfile leftovers in mainline.  This code is already
>> gone in CVS.
> 
> Any chance to pass on these three no-risk mainline-only patches to
> Linus?  I'm pretty sure they'll get lost otherwise until the next
> merge window..

Lachlan, has this been pushed upstream yet?

Thanks

-- 

  Mark Goodwin                                  markgw@sgi.com
  Engineering Manager for XFS and PCP    Phone: +61-3-99631937
  SGI Australian Software Group           Cell: +61-4-18969583
-------------------------------------------------------------