Hi, I've noticed the nfsd read corruption by recent change. And this patch fixes the problem for me, is this right fix? -- OGAWA Hirofumi <[EMAIL PROTECTED]>
__splice_from_pipe() is updating the sd->pos for the actor, but those functions are passing the sd of reader side directory. So, splice updates sd->pos twice. This fixes usage of __splice_from_pipe(). Signed-off-by: OGAWA Hirofumi <[EMAIL PROTECTED]> --- drivers/block/loop.c | 5 +++-- fs/nfsd/vfs.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff -puN fs/nfsd/vfs.c~splice-fix-__splice_from_pipe-usage fs/nfsd/vfs.c --- linux-2.6/fs/nfsd/vfs.c~splice-fix-__splice_from_pipe-usage 2007-07-16 09:30:10.000000000 +0900 +++ linux-2.6-hirofumi/fs/nfsd/vfs.c 2007-07-16 09:30:10.000000000 +0900 @@ -842,9 +842,10 @@ nfsd_splice_actor(struct pipe_inode_info } static int nfsd_direct_splice_actor(struct pipe_inode_info *pipe, - struct splice_desc *sd) + struct splice_desc *__sd) { - return __splice_from_pipe(pipe, sd, nfsd_splice_actor); + struct splice_desc sd = *__sd; + return __splice_from_pipe(pipe, &sd, nfsd_splice_actor); } static __be32 diff -puN drivers/block/loop.c~splice-fix-__splice_from_pipe-usage drivers/block/loop.c --- linux-2.6/drivers/block/loop.c~splice-fix-__splice_from_pipe-usage 2007-07-16 09:30:10.000000000 +0900 +++ linux-2.6-hirofumi/drivers/block/loop.c 2007-07-16 09:30:10.000000000 +0900 @@ -437,9 +437,10 @@ lo_splice_actor(struct pipe_inode_info * } static int -lo_direct_splice_actor(struct pipe_inode_info *pipe, struct splice_desc *sd) +lo_direct_splice_actor(struct pipe_inode_info *pipe, struct splice_desc *__sd) { - return __splice_from_pipe(pipe, sd, lo_splice_actor); + struct splice_desc sd = *__sd; + return __splice_from_pipe(pipe, &sd, lo_splice_actor); } static int _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/