linux-kernel - Re: [PATCH] staging/lustre: kiocb->ki

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20130806150308.GB8043@kvack.org>
Date:	Tue, 6 Aug 2013 11:03:08 -0400
From:	Benjamin LaHaise <bcrl@...ck.org>
To:	Peng Tao <bergwolf@...il.com>
Cc:	linux-kernel@...r.kernel.org, Peng Tao <tao.peng@....com>,
	Kent Overstreet <koverstreet@...gle.com>,
	Andreas Dilger <andreas.dilger@...el.com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	linux-aio@...ck.org
Subject: Re: [PATCH] staging/lustre: kiocb->ki_left is removed

On Tue, Aug 06, 2013 at 08:31:01PM +0800, Peng Tao wrote:
> From: Peng Tao <tao.peng@....com>
> 
> We also missed ki_nbytes...

Applied to the aio-next.git tree.

		-ben

> Cc: Kent Overstreet <koverstreet@...gle.com>
> Cc: Andreas Dilger <andreas.dilger@...el.com>
> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Signed-off-by: Peng Tao <tao.peng@....com>
> ---
> This fixes Lustre build in linux-next and needs to go through
> the aio tree as Kent's AIO patch is not in upstream kernel. 
> 
>  drivers/staging/lustre/lustre/llite/file.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
> index 253f026..bc534db 100644
> --- a/drivers/staging/lustre/lustre/llite/file.c
> +++ b/drivers/staging/lustre/lustre/llite/file.c
> @@ -1009,7 +1009,7 @@ static ssize_t ll_file_read(struct file *file, char *buf, size_t count,
>  	local_iov->iov_len = count;
>  	init_sync_kiocb(kiocb, file);
>  	kiocb->ki_pos = *ppos;
> -	kiocb->ki_left = count;
> +	kiocb->ki_nbytes = count;
>  
>  	result = ll_file_aio_read(kiocb, local_iov, 1, kiocb->ki_pos);
>  	*ppos = kiocb->ki_pos;
> @@ -1068,7 +1068,7 @@ static ssize_t ll_file_write(struct file *file, const char *buf, size_t count,
>  	local_iov->iov_len = count;
>  	init_sync_kiocb(kiocb, file);
>  	kiocb->ki_pos = *ppos;
> -	kiocb->ki_left = count;
> +	kiocb->ki_nbytes = count;
>  
>  	result = ll_file_aio_write(kiocb, local_iov, 1, kiocb->ki_pos);
>  	*ppos = kiocb->ki_pos;
> -- 
> 1.7.9.5

-- 
"Thought is the essence of where you are now."
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/