Skip to content

Commit f267cb8

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.7.y' into v6.7+
2 parents 7863721 + d6d6c49 commit f267cb8

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 7
4-
SUBLEVEL = 7
4+
SUBLEVEL = 8
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

fs/ntfs3/frecord.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2457,7 +2457,6 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,
24572457
struct ATTR_LIST_ENTRY *le = NULL;
24582458
struct runs_tree *run = &ni->file.run;
24592459
u64 valid_size = ni->i_valid;
2460-
loff_t i_size = i_size_read(&ni->vfs_inode);
24612460
u64 vbo_disk;
24622461
size_t unc_size;
24632462
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,
25092508
err = -EOPNOTSUPP;
25102509
goto out1;
25112510
#else
2511+
loff_t i_size = i_size_read(&ni->vfs_inode);
25122512
u32 frame_bits = ni_ext_compress_bits(ni);
25132513
u64 frame64 = frame_vbo >> frame_bits;
25142514
u64 frames, vbo_data;

0 commit comments

Comments
 (0)