file_inode() and ->f_mapping cleanups
Subsystems (12)
Al Viro
maintainerPATCH 1/1 file_inode() and ->f_mapping cleanups
Another whack-a-mole pile - open-coding file_inode()
and file->f_mapping. All of them are independent from each other; this stuff sits in vfs.git #work.file_inode, but if maintainers of an affected subsystems would prefer to have some of that in their trees - just say so.
Al Viro
maintainerPATCH 1/8 ibmvmc: don't open-code file_inode()
badly, at that...
--- drivers/misc/ibmvmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/misc/ibmvmc.c +4 -2
@@ -1039,6 +1039,7 @@ static unsigned int ibmvmc_poll(struct file *file, poll_table *wait)static ssize_t ibmvmc_write (struct file *file,const char *buffer,size_t count,loff_t *ppos) { +struct inode *inode;struct ibmvmc_buffer *vmc_buffer;struct ibmvmc_file_session *session;struct crq_server_adapter *adapter;
@@ -1122,8 +1123,9 @@ static ssize_t ibmvmc_write(struct file *file, const char *buffer,if (p == buffer) goto out; - file->f_path.dentry->d_inode->i_mtime =current_time (file_inode (file)); -mark_inode_dirty (file->f_path.dentry->d_inode); + inode =file_inode (file); + inode->i_mtime =current_time (inode); +mark_inode_dirty (inode);dev_dbg (adapter->dev,"write: file = 0x%lx, count = 0x%lx\n" , (unsigned long )file, (unsigned long )count);
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 2/8 exfat_iterate(): don't open-code file_inode(file)
In reply to Al Viroand it's file, not filp...
--- fs/exfat/dir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/exfat/dir.c +3 -3
@@ -212,9 +212,9 @@ static void exfat_free_namebuf(struct exfat_dentry_namebuf *nb)/* skip iterating emit_dots when dir is empty */ #define ITER_POS_FILLED_DOTS (2) -static int exfat_iterate (struct file *filp,struct dir_context *ctx) +static int exfat_iterate (struct file *file,struct dir_context *ctx) { -struct inode *inode = filp->f_path.dentry->d_inode; +struct inode *inode =file_inode (file);struct super_block *sb = inode->i_sb;struct inode *tmp;struct exfat_dir_entry de;
@@ -228,7 +228,7 @@ static int exfat_iterate(struct file *filp, struct dir_context *ctx)mutex_lock (&EXFAT_SB (sb)->s_lock); cpos = ctx->pos; -if (!dir_emit_dots (filp, ctx)) +if (!dir_emit_dots (file, ctx)) goto unlock;if (ctx->pos ==ITER_POS_FILLED_DOTS ) {
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 3/8 sgx: use ->f_mapping...
In reply to Al Viro--- arch/x86/kernel/cpu/sgx/encl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/kernel/cpu/sgx/encl.c +1 -2
@@ -906,8 +906,7 @@ const cpumask_t *sgx_encl_cpumask(struct sgx_encl *encl)static struct page *sgx_encl_get_backing_page (struct sgx_encl *encl,pgoff_t index) { -struct inode *inode = encl->backing->f_path.dentry->d_inode; -struct address_space *mapping = inode->i_mapping; +struct address_space *mapping = encl->backing->f_mapping;gfp_t gfpmask =mapping_gfp_mask (mapping);return shmem_read_mapping_page_gfp (mapping, index, gfpmask);
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 4/8 bprm_fill_uid(): don't open-code file_inode()
In reply to Al Viro--- fs/exec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/exec.c +1 -2
@@ -1595,7 +1595,7 @@ static void bprm_fill_uid(struct linux_binprm *bprm, struct file *file) {/* Handle suid and sgid on files */ struct user_namespace *mnt_userns; -struct inode *inode; +struct inode *inode =file_inode (file);unsigned int mode;kuid_t uid;kgid_t gid;
@@ -1606,7 +1606,6 @@ static void bprm_fill_uid(struct linux_binprm *bprm, struct file *file)if (task_no_new_privs (current))return ; - inode = file->f_path.dentry->d_inode; mode =READ_ONCE (inode->i_mode);if (!(mode & (S_ISUID |S_ISGID )))return ;
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 5/8 nfs_finish_open(): don't open-code file_inode()
In reply to Al Viro--- fs/nfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/dir.c +1 -1
@@ -2022,7 +2022,7 @@ static int nfs_finish_open(struct nfs_open_context *ctx, err =finish_open (file, dentry, do_open);if (err) goto out; -if (S_ISREG (file->f_path.dentry->d_inode->i_mode)) +if (S_ISREG (file_inode (file)->i_mode))nfs_file_set_open_context (file, ctx);else err = -EOPENSTALE ;
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 6/8 dma_buf: no need to bother with file_inode()->i_mapping
In reply to Al Viro->f_mapping will do just fine
--- drivers/dma-buf/udmabuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma-buf/udmabuf.c +1 -1
@@ -210,7 +210,7 @@ static long udmabuf_create(struct miscdevice *device, memfd =fget (list[i].memfd);if (!memfd) goto err; - mapping =file_inode (memfd)->i_mapping; + mapping = memfd->f_mapping;if (!shmem_mapping (mapping) && !is_file_hugepages (memfd)) goto err; seals =memfd_fcntl (memfd,F_GET_SEALS ,0 );
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 7/8 _nfs42_proc_copy(): use ->f_mapping instead of file_inode()->i_mapping
In reply to Al Viro--- fs/nfs/nfs42proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs42proc.c +1 -1
@@ -336,7 +336,7 @@ static ssize_t _nfs42_proc_copy(struct file *src,return status; } } - status =nfs_filemap_write_and_wait_range (file_inode (src)->i_mapping, + status =nfs_filemap_write_and_wait_range (src->f_mapping, pos_src, pos_src + (loff_t )count -1 );if (status)return status;
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 8/8 orangefs: use ->f_mapping
In reply to Al Viro... and don't check for impossible conditions - file_inode() is never NULL in anything seen by ->release() and neither is its ->i_mapping.
--- fs/orangefs/file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/orangefs/file.c +1 -3
@@ -417,9 +417,7 @@ static int orangefs_file_release(struct inode *inode, struct file *file)* readahead cache (if any); this forces an expensive refresh of * data for the next caller of mmap (or 'get_block' accesses) */ -if (file_inode (file) && -file_inode (file)->i_mapping && -mapping_nrpages (&file_inode (file)->i_data)) { +if (mapping_nrpages (file->f_mapping)) {if (orangefs_features &ORANGEFS_FEATURE_READAHEAD ) { gossip_debug(GOSSIP_INODE_DEBUG, "calling flush_racache on %pU\n",
Signature · 1 line
2.30.2
Re: [PATCH 3/8] sgx: use ->f_mapping...
In reply to Al ViroQuoted 22 lines · Al Viro
Signed-off-by Al Viro <[email protected]>--- arch/x86/kernel/cpu/sgx/encl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/x86/kernel/cpu/sgx/encl.c +1
-2@@ -906,8 +906,7 @@ const cpumask_t *sgx_encl_cpumask(struct sgx_encl *encl)static struct page *sgx_encl_get_backing_page (struct sgx_encl *encl,pgoff_t index) { -struct inode *inode = encl->backing->f_path.dentry->d_inode; -struct address_space *mapping = inode->i_mapping; +struct address_space *mapping = encl->backing->f_mapping;gfp_t gfpmask =mapping_gfp_mask (mapping);return shmem_read_mapping_page_gfp (mapping, index, gfpmask);Signature · 1 line
2.30.2
BR, Jarkko
Quoted 6 lines · Al Viro
Another whack-a-mole pile - open-coding
file_inode()
andfile->f_mapping. All of them are independent from each other; this stuff sits in vfs.git #work.file_inode, but if maintainers of an affected subsystems would prefer to have some of that in their trees - just say so.
Oh sweet, I wondered whether I should bother with a series like that a few weeks ago...
Mike Marshall
maintainerRe: [PATCH 8/8] orangefs: use ->f_mapping
In reply to Al ViroI added this patch to one of the 6.0 rc's that I've been running through xfstests, no regressions... so...
You can add tested by me if you'd like...
Thanks!
-Mike
Quoted 28 lines · Al Viro
... and don't check for impossible conditions -
file_inode()is never NULL in anything seen by ->release() and neither is its ->i_mapping.Signed-off-by Al Viro <[email protected]>--- fs/orangefs/file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)fs/orangefs/file.c +1
-4@@ -417,9 +417,7 @@ static int orangefs_file_release(struct inode *inode, struct file *file)* readahead cache (if any); this forces an expensive refresh of * data for the next caller of mmap (or 'get_block' accesses) */ -if (file_inode (file) && -file_inode (file)->i_mapping && -mapping_nrpages (&file_inode (file)->i_data)) { +if (mapping_nrpages (file->f_mapping)) {if (orangefs_features &ORANGEFS_FEATURE_READAHEAD ) { gossip_debug(GOSSIP_INODE_DEBUG, "calling flush_racache on %pU\n", --2.30.2