From: Jan Kara <jack@suse.cz>
To: <linux-fsdevel@vger.kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.cz>
Subject: [PATCH v2 12/12] udf: Convert udf_expand_file_adinicb() to avoid kmap_atomic()
Date: Wed, 25 Jan 2023 10:41:54 +0100 [thread overview]
Message-ID: <20230125094159.10877-12-jack@suse.cz> (raw)
In-Reply-To: <20230125093914.24627-1-jack@suse.cz>
Remove the last two remaining kmap_atomic() uses in UDF in
udf_expand_file_adinicb(). The first use can be actually conveniently
replaced with udf_adinicb_readpage(), the second with memcpy_to_page().
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/udf/inode.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 66e491626d74..0ef2f8e5d301 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -335,7 +335,6 @@ const struct address_space_operations udf_aops = {
int udf_expand_file_adinicb(struct inode *inode)
{
struct page *page;
- char *kaddr;
struct udf_inode_info *iinfo = UDF_I(inode);
int err;
@@ -357,16 +356,8 @@ int udf_expand_file_adinicb(struct inode *inode)
if (!page)
return -ENOMEM;
- if (!PageUptodate(page)) {
- kaddr = kmap_atomic(page);
- memset(kaddr + iinfo->i_lenAlloc, 0x00,
- PAGE_SIZE - iinfo->i_lenAlloc);
- memcpy(kaddr, iinfo->i_data + iinfo->i_lenEAttr,
- iinfo->i_lenAlloc);
- flush_dcache_page(page);
- SetPageUptodate(page);
- kunmap_atomic(kaddr);
- }
+ if (!PageUptodate(page))
+ udf_adinicb_readpage(page);
down_write(&iinfo->i_data_sem);
memset(iinfo->i_data + iinfo->i_lenEAttr, 0x00,
iinfo->i_lenAlloc);
@@ -383,9 +374,8 @@ int udf_expand_file_adinicb(struct inode *inode)
/* Restore everything back so that we don't lose data... */
lock_page(page);
down_write(&iinfo->i_data_sem);
- kaddr = kmap_atomic(page);
- memcpy(iinfo->i_data + iinfo->i_lenEAttr, kaddr, inode->i_size);
- kunmap_atomic(kaddr);
+ memcpy_to_page(page, 0, iinfo->i_data + iinfo->i_lenEAttr,
+ inode->i_size);
unlock_page(page);
iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
iinfo->i_lenAlloc = inode->i_size;
--
2.35.3
prev parent reply other threads:[~2023-01-25 9:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 9:41 [PATCH v2 0/12] udf: Unify aops Jan Kara
2023-01-25 9:41 ` [PATCH v2 01/12] udf: Unify .read_folio for normal and in-ICB files Jan Kara
2023-01-25 9:41 ` [PATCH v2 02/12] udf: Convert in-ICB files to use udf_writepages() Jan Kara
2023-01-25 9:41 ` [PATCH v2 03/12] udf: Convert in-ICB files to use udf_direct_IO() Jan Kara
2023-01-25 9:41 ` [PATCH v2 04/12] udf: Convert in-ICB files to use udf_write_begin() Jan Kara
2023-01-25 9:41 ` [PATCH v2 05/12] udf: Convert all file types to use udf_write_end() Jan Kara
2023-01-25 9:41 ` [PATCH v2 06/12] udf: Add handling of in-ICB files to udf_bmap() Jan Kara
2023-01-25 9:41 ` [PATCH v2 07/12] udf: Switch to single address_space_operations Jan Kara
2023-01-25 9:41 ` [PATCH v2 08/12] udf: Mark aops implementation static Jan Kara
2023-01-25 9:41 ` [PATCH v2 09/12] udf: Move udf_adinicb_readpage() to inode.c Jan Kara
2023-01-25 9:41 ` [PATCH v2 10/12] udf: Switch udf_adinicb_readpage() to kmap_local_page() Jan Kara
2023-01-25 9:41 ` [PATCH v2 11/12] udf: Convert udf_adinicb_writepage() to memcpy_to_page() Jan Kara
2023-01-25 9:41 ` Jan Kara [this message]
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=20230125094159.10877-12-jack@suse.cz \
--to=jack@suse.cz \
--cc=hch@infradead.org \
--cc=linux-fsdevel@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).