Merge tag 'cxl-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl

[linux-2.6-microblaze.git] / fs / ntfs / file.c

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 2ae25e4..a8abe22 100644 (file)
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -251,14 +251,14 @@ do_non_resident_extend:
                 *
                 * TODO: For sparse pages could optimize this workload by using
                 * the FsMisc / MiscFs page bit as a "PageIsSparse" bit.  This
-                * would be set in readpage for sparse pages and here we would
+                * would be set in read_folio for sparse pages and here we would
                 * not need to mark dirty any pages which have this bit set.
                 * The only caveat is that we have to clear the bit everywhere
                 * where we allocate any clusters that lie in the page or that
                 * contain the page.
                 *
                 * TODO: An even greater optimization would be for us to only
-                * call readpage() on pages which are not in sparse regions as
+                * call read_folio() on pages which are not in sparse regions as
                 * determined from the runlist.  This would greatly reduce the
                 * number of pages we read and make dirty in the case of sparse
                 * files.
@@ -1772,11 +1772,11 @@ static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i,
        last_vcn = -1;
        do {
                VCN vcn;
-               pgoff_t idx, start_idx;
+               pgoff_t start_idx;
                unsigned ofs, do_pages, u;
                size_t copied;
 
-               start_idx = idx = pos >> PAGE_SHIFT;
+               start_idx = pos >> PAGE_SHIFT;
                ofs = pos & ~PAGE_MASK;
                bytes = PAGE_SIZE - ofs;
                do_pages = 1;