lkml.org 
[lkml]   [2021]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] fs/ntfs3: Remove unnecessary condition checking from ntfs_file_read_iter
From
Date


On 25.08.2021 21:25, Kari Argillander wrote:
> This check will be also performed in generic_file_read_iter() so we do
> not want to check this two times in a row.
>
> This was founded with Smatch
> fs/ntfs3/file.c:803 ntfs_file_read_iter()
> warn: unused return: count = iov_iter_count()
>
> Signed-off-by: Kari Argillander <kari.argillander@gmail.com>
> ---
> I cc Dan also because I am happy that I finally managed to install
> Smack and straight away I found something with it. Thank you for
> this great tool.
>
> Next step is to integrate Smack to CI system. But will probanly take
> a moment.
> ---
> fs/ntfs3/file.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
> index cb736701f2cc..5d41b84067ee 100644
> --- a/fs/ntfs3/file.c
> +++ b/fs/ntfs3/file.c
> @@ -799,8 +799,6 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
>
> static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
> {
> - ssize_t err;
> - size_t count = iov_iter_count(iter);
> struct file *file = iocb->ki_filp;
> struct inode *inode = file->f_mapping->host;
> struct ntfs_inode *ni = ntfs_i(inode);
> @@ -829,9 +827,7 @@ static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
> return -EOPNOTSUPP;
> }
>
> - err = count ? generic_file_read_iter(iocb, iter) : 0;
> -
> - return err;
> + return generic_file_read_iter(iocb, iter);
> }
>
> /* returns array of locked pages */
>

Applied, thanks!

\
 
 \ /
  Last update: 2021-09-02 18:27    [W:0.072 / U:0.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site