From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
Sasha Levin <sashal@kernel.org>,
ntfs3@lists.linux.dev
Subject: [PATCH AUTOSEL 6.6 18/51] fs/ntfs3: Use i_size_read and i_size_write
Date: Mon, 12 Feb 2024 19:19:55 -0500 [thread overview]
Message-ID: <20240213002052.670571-18-sashal@kernel.org> (raw)
In-Reply-To: <20240213002052.670571-1-sashal@kernel.org>
From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
[ Upstream commit 4fd6c08a16d7f1ba10212c9ef7bc73218144b463 ]
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ntfs3/attrib.c | 4 ++--
fs/ntfs3/dir.c | 2 +-
fs/ntfs3/file.c | 11 ++++++-----
fs/ntfs3/frecord.c | 10 +++++-----
fs/ntfs3/index.c | 8 ++++----
fs/ntfs3/inode.c | 2 +-
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c
index 646e2dad1b75..7aadf5010999 100644
--- a/fs/ntfs3/attrib.c
+++ b/fs/ntfs3/attrib.c
@@ -2084,7 +2084,7 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)
/* Update inode size. */
ni->i_valid = valid_size;
- ni->vfs_inode.i_size = data_size;
+ i_size_write(&ni->vfs_inode, data_size);
inode_set_bytes(&ni->vfs_inode, total_size);
ni->ni_flags |= NI_FLAG_UPDATE_PARENT;
mark_inode_dirty(&ni->vfs_inode);
@@ -2499,7 +2499,7 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)
mi_b->dirty = true;
done:
- ni->vfs_inode.i_size += bytes;
+ i_size_write(&ni->vfs_inode, ni->vfs_inode.i_size + bytes);
ni->ni_flags |= NI_FLAG_UPDATE_PARENT;
mark_inode_dirty(&ni->vfs_inode);
diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c
index 726122ecd39b..2c73ca469d51 100644
--- a/fs/ntfs3/dir.c
+++ b/fs/ntfs3/dir.c
@@ -517,7 +517,7 @@ static int ntfs_dir_count(struct inode *dir, bool *is_empty, size_t *dirs,
u32 e_size, off, end;
size_t drs = 0, fles = 0, bit = 0;
struct indx_node *node = NULL;
- size_t max_indx = ni->vfs_inode.i_size >> ni->dir.index_bits;
+ size_t max_indx = i_size_read(&ni->vfs_inode) >> ni->dir.index_bits;
if (is_empty)
*is_empty = true;
diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index a5bbf7b5775a..0f6a78aef90f 100644
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -646,7 +646,7 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
if (err)
goto out;
} else if (new_size > i_size) {
- inode->i_size = new_size;
+ i_size_write(inode, new_size);
}
}
@@ -696,7 +696,7 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
goto out;
}
inode_dio_wait(inode);
- oldsize = inode->i_size;
+ oldsize = i_size_read(inode);
newsize = attr->ia_size;
if (newsize <= oldsize)
@@ -708,7 +708,7 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
goto out;
ni->ni_flags |= NI_FLAG_UPDATE_PARENT;
- inode->i_size = newsize;
+ i_size_write(inode, newsize);
}
setattr_copy(idmap, inode, attr);
@@ -847,7 +847,7 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)
size_t count = iov_iter_count(from);
loff_t pos = iocb->ki_pos;
struct inode *inode = file_inode(file);
- loff_t i_size = inode->i_size;
+ loff_t i_size = i_size_read(inode);
struct address_space *mapping = inode->i_mapping;
struct ntfs_inode *ni = ntfs_i(inode);
u64 valid = ni->i_valid;
@@ -1177,7 +1177,8 @@ static int ntfs_file_release(struct inode *inode, struct file *file)
down_write(&ni->file.run_lock);
err = attr_set_size(ni, ATTR_DATA, NULL, 0, &ni->file.run,
- inode->i_size, &ni->i_valid, false, NULL);
+ i_size_read(inode), &ni->i_valid, false,
+ NULL);
up_write(&ni->file.run_lock);
ni_unlock(ni);
diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index a918d7283aca..61c51650266e 100644
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -2099,7 +2099,7 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page)
gfp_t gfp_mask;
struct page *pg;
- if (vbo >= ni->vfs_inode.i_size) {
+ if (vbo >= i_size_read(&ni->vfs_inode)) {
SetPageUptodate(page);
err = 0;
goto out;
@@ -2173,7 +2173,7 @@ int ni_decompress_file(struct ntfs_inode *ni)
{
struct ntfs_sb_info *sbi = ni->mi.sbi;
struct inode *inode = &ni->vfs_inode;
- loff_t i_size = inode->i_size;
+ loff_t i_size = i_size_read(inode);
struct address_space *mapping = inode->i_mapping;
gfp_t gfp_mask = mapping_gfp_mask(mapping);
struct page **pages = NULL;
@@ -2457,6 +2457,7 @@ 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;
@@ -2548,7 +2549,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,
}
}
- frames = (ni->vfs_inode.i_size - 1) >> frame_bits;
+ frames = (i_size - 1) >> frame_bits;
err = attr_wof_frame_info(ni, attr, run, frame64, frames,
frame_bits, &ondisk_size, &vbo_data);
@@ -2556,8 +2557,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,
goto out2;
if (frame64 == frames) {
- unc_size = 1 + ((ni->vfs_inode.i_size - 1) &
- (frame_size - 1));
+ unc_size = 1 + ((i_size - 1) & (frame_size - 1));
ondisk_size = attr_size(attr) - vbo_data;
} else {
unc_size = frame_size;
diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c
index cf92b2433f7a..daabaad63aaf 100644
--- a/fs/ntfs3/index.c
+++ b/fs/ntfs3/index.c
@@ -1462,7 +1462,7 @@ static int indx_create_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,
goto out2;
if (in->name == I30_NAME) {
- ni->vfs_inode.i_size = data_size;
+ i_size_write(&ni->vfs_inode, data_size);
inode_set_bytes(&ni->vfs_inode, alloc_size);
}
@@ -1544,7 +1544,7 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,
}
if (in->name == I30_NAME)
- ni->vfs_inode.i_size = data_size;
+ i_size_write(&ni->vfs_inode, data_size);
*vbn = bit << indx->idx2vbn_bits;
@@ -2090,7 +2090,7 @@ static int indx_shrink(struct ntfs_index *indx, struct ntfs_inode *ni,
return err;
if (in->name == I30_NAME)
- ni->vfs_inode.i_size = new_data;
+ i_size_write(&ni->vfs_inode, new_data);
bpb = bitmap_size(bit);
if (bpb * 8 == nbits)
@@ -2576,7 +2576,7 @@ int indx_delete_entry(struct ntfs_index *indx, struct ntfs_inode *ni,
err = attr_set_size(ni, ATTR_ALLOC, in->name, in->name_len,
&indx->alloc_run, 0, NULL, false, NULL);
if (in->name == I30_NAME)
- ni->vfs_inode.i_size = 0;
+ i_size_write(&ni->vfs_inode, 0);
err = ni_remove_attr(ni, ATTR_ALLOC, in->name, in->name_len,
false, NULL);
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 012dbc8ac5ec..34f2e16f3f5b 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -983,7 +983,7 @@ int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
}
if (pos + err > inode->i_size) {
- inode->i_size = pos + err;
+ i_size_write(inode, pos + err);
dirty = true;
}
--
2.43.0
next prev parent reply other threads:[~2024-02-13 0:21 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 0:19 [PATCH AUTOSEL 6.6 01/51] fs/ntfs3: Improve alternative boot processing Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 02/51] fs/ntfs3: Modified fix directory element type detection Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 03/51] fs/ntfs3: Improve ntfs_dir_count Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 04/51] fs/ntfs3: Correct hard links updating when dealing with DOS names Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 05/51] fs/ntfs3: Print warning while fixing hard links count Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 06/51] fs/ntfs3: Reduce stack usage Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 07/51] fs/ntfs3: Fix multithreaded stress test Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 08/51] fs/ntfs3: Fix detected field-spanning write (size 8) of single field "le->name" Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 09/51] fs/ntfs3: Add file_modified Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 10/51] fs/ntfs3: Drop suid and sgid bits as a part of fpunch Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 11/51] fs/ntfs3: Implement super_operations::shutdown Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 12/51] fs/ntfs3: ntfs3_forced_shutdown use int instead of bool Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 13/51] fs/ntfs3: Add NULL ptr dereference checking at the end of attr_allocate_frame() Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 14/51] fs/ntfs3: Disable ATTR_LIST_ENTRY size check Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 15/51] fs/ntfs3: Use kvfree to free memory allocated by kvmalloc Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 16/51] fs/ntfs3: use non-movable memory for ntfs3 MFT buffer cache Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 17/51] fs/ntfs3: Prevent generic message "attempt to access beyond end of device" Sasha Levin
2024-02-13 0:19 ` Sasha Levin [this message]
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 19/51] fs/ntfs3: Correct function is_rst_area_valid Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 20/51] fs/ntfs3: Fixed overflow check in mi_enum_attr() Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 21/51] fs/ntfs3: Update inode->i_size after success write into compressed file Sasha Levin
2024-02-13 0:19 ` [PATCH AUTOSEL 6.6 22/51] fs/ntfs3: Fix oob in ntfs_listxattr Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 23/51] wifi: mac80211: set station RX-NSS on reconfig Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 24/51] wifi: mac80211: adding missing drv_mgd_complete_tx() call Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 25/51] wifi: mac80211: accept broadcast probe responses on 6 GHz Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 26/51] wifi: iwlwifi: do not announce EPCS support Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 27/51] efi: runtime: Fix potential overflow of soft-reserved region size Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 28/51] efi: Don't add memblocks for soft-reserved memory Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 29/51] hwmon: (coretemp) Enlarge per package core count limit Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 30/51] scsi: lpfc: Use unsigned type for num_sge Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 31/51] scsi: ufs: core: Fix shift issue in ufshcd_clear_cmd() Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 32/51] scsi: ufs: core: Remove the ufshcd_release() in ufshcd_err_handling_prepare() Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 33/51] LoongArch: Select ARCH_ENABLE_THP_MIGRATION instead of redefining it Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 34/51] LoongArch: Select HAVE_ARCH_SECCOMP to use the common SECCOMP menu Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 35/51] LoongArch: Change acpi_core_pic[NR_CPUS] to acpi_core_pic[MAX_CORE_PIC] Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 36/51] LoongArch: vDSO: Disable UBSAN instrumentation Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 37/51] accel/ivpu: Force snooping for MMU writes Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 38/51] accel/ivpu: Disable d3hot_delay on all NPU generations Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 39/51] accel/ivpu/40xx: Stop passing SKU boot parameters to FW Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 40/51] firewire: core: send bus reset promptly on gap count error Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 41/51] libceph: fail sparse-read if the data length doesn't match Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 42/51] PCI: dwc: Clean up dw_pcie_ep_raise_msi_irq() alignment Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 43/51] drm/amdgpu: skip to program GFXDEC registers for suspend abort Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 44/51] drm/amdgpu: reset gpu for s3 suspend abort case Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 45/51] drm/amdgpu: Fix shared buff copy to user Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 46/51] drm/amdgpu: Fix HDP flush for VFs on nbio v7.9 Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 47/51] smb: client: set correct d_type for reparse points under DFS mounts Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 48/51] virtio-blk: Ensure no requests in virtqueues before deleting vqs Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 49/51] cifs: change tcon status when need_reconnect is set on it Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 50/51] cifs: handle cases where multiple sessions share connection Sasha Levin
2024-02-13 0:20 ` [PATCH AUTOSEL 6.6 51/51] smb3: clarify mount warning Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240213002052.670571-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).