34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 6130b6bd8d6c5..a3bdd583afcc6 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
VERSION = 6
|
|
PATCHLEVEL = 6
|
|
-SUBLEVEL = 19
|
|
+SUBLEVEL = 20
|
|
EXTRAVERSION =
|
|
NAME = Hurr durr I'ma ninja sloth
|
|
|
|
diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
|
|
index 61c51650266ef..22fe7f58ad638 100644
|
|
--- a/fs/ntfs3/frecord.c
|
|
+++ b/fs/ntfs3/frecord.c
|
|
@@ -2457,7 +2457,6 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,
|
|
struct ATTR_LIST_ENTRY *le = NULL;
|
|
struct runs_tree *run = &ni->file.run;
|
|
u64 valid_size = ni->i_valid;
|
|
- loff_t i_size = i_size_read(&ni->vfs_inode);
|
|
u64 vbo_disk;
|
|
size_t unc_size;
|
|
u32 frame_size, i, npages_disk, ondisk_size;
|
|
@@ -2509,6 +2508,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,
|
|
err = -EOPNOTSUPP;
|
|
goto out1;
|
|
#else
|
|
+ loff_t i_size = i_size_read(&ni->vfs_inode);
|
|
u32 frame_bits = ni_ext_compress_bits(ni);
|
|
u64 frame64 = frame_vbo >> frame_bits;
|
|
u64 frames, vbo_data;
|