OSDN Git Service

fs/ntfs3: Remove unnecessary condition checking from ntfs_file_read_iter
authorKari Argillander <kari.argillander@gmail.com>
Wed, 25 Aug 2021 18:25:22 +0000 (21:25 +0300)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Thu, 2 Sep 2021 15:51:26 +0000 (18:51 +0300)
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>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
fs/ntfs3/file.c

index f9c9a8c..424450e 100644 (file)
@@ -793,8 +793,6 @@ out:
 
 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);
@@ -823,9 +821,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);
 }
 
 /*