Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

don't open-code file_inode()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 45063097 e5517c2a

+40 -46
+10 -10
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 2501 2501 static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, 2502 2502 size_t size, loff_t *pos) 2503 2503 { 2504 - struct amdgpu_device *adev = f->f_inode->i_private; 2504 + struct amdgpu_device *adev = file_inode(f)->i_private; 2505 2505 ssize_t result = 0; 2506 2506 int r; 2507 2507 bool pm_pg_lock, use_bank; ··· 2570 2570 static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf, 2571 2571 size_t size, loff_t *pos) 2572 2572 { 2573 - struct amdgpu_device *adev = f->f_inode->i_private; 2573 + struct amdgpu_device *adev = file_inode(f)->i_private; 2574 2574 ssize_t result = 0; 2575 2575 int r; 2576 2576 ··· 2601 2601 static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf, 2602 2602 size_t size, loff_t *pos) 2603 2603 { 2604 - struct amdgpu_device *adev = f->f_inode->i_private; 2604 + struct amdgpu_device *adev = file_inode(f)->i_private; 2605 2605 ssize_t result = 0; 2606 2606 int r; 2607 2607 ··· 2628 2628 static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user *buf, 2629 2629 size_t size, loff_t *pos) 2630 2630 { 2631 - struct amdgpu_device *adev = f->f_inode->i_private; 2631 + struct amdgpu_device *adev = file_inode(f)->i_private; 2632 2632 ssize_t result = 0; 2633 2633 int r; 2634 2634 ··· 2656 2656 static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, 2657 2657 size_t size, loff_t *pos) 2658 2658 { 2659 - struct amdgpu_device *adev = f->f_inode->i_private; 2659 + struct amdgpu_device *adev = file_inode(f)->i_private; 2660 2660 ssize_t result = 0; 2661 2661 int r; 2662 2662 ··· 2683 2683 static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user *buf, 2684 2684 size_t size, loff_t *pos) 2685 2685 { 2686 - struct amdgpu_device *adev = f->f_inode->i_private; 2686 + struct amdgpu_device *adev = file_inode(f)->i_private; 2687 2687 ssize_t result = 0; 2688 2688 int r; 2689 2689 ··· 2711 2711 static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf, 2712 2712 size_t size, loff_t *pos) 2713 2713 { 2714 - struct amdgpu_device *adev = f->f_inode->i_private; 2714 + struct amdgpu_device *adev = file_inode(f)->i_private; 2715 2715 ssize_t result = 0; 2716 2716 int r; 2717 2717 ··· 2738 2738 static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *buf, 2739 2739 size_t size, loff_t *pos) 2740 2740 { 2741 - struct amdgpu_device *adev = f->f_inode->i_private; 2741 + struct amdgpu_device *adev = file_inode(f)->i_private; 2742 2742 ssize_t result = 0; 2743 2743 int r; 2744 2744 ··· 2766 2766 static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf, 2767 2767 size_t size, loff_t *pos) 2768 2768 { 2769 - struct amdgpu_device *adev = f->f_inode->i_private; 2769 + struct amdgpu_device *adev = file_inode(f)->i_private; 2770 2770 ssize_t result = 0; 2771 2771 int r; 2772 2772 uint32_t *config, no_regs = 0; ··· 2836 2836 static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, 2837 2837 size_t size, loff_t *pos) 2838 2838 { 2839 - struct amdgpu_device *adev = f->f_inode->i_private; 2839 + struct amdgpu_device *adev = file_inode(f)->i_private; 2840 2840 int idx, r; 2841 2841 int32_t value; 2842 2842
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
··· 283 283 static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, 284 284 size_t size, loff_t *pos) 285 285 { 286 - struct amdgpu_ring *ring = (struct amdgpu_ring*)f->f_inode->i_private; 286 + struct amdgpu_ring *ring = file_inode(f)->i_private; 287 287 int r, i; 288 288 uint32_t value, result, early[3]; 289 289
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
··· 1412 1412 static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf, 1413 1413 size_t size, loff_t *pos) 1414 1414 { 1415 - struct amdgpu_device *adev = f->f_inode->i_private; 1415 + struct amdgpu_device *adev = file_inode(f)->i_private; 1416 1416 ssize_t result = 0; 1417 1417 int r; 1418 1418 ··· 1456 1456 static ssize_t amdgpu_ttm_gtt_read(struct file *f, char __user *buf, 1457 1457 size_t size, loff_t *pos) 1458 1458 { 1459 - struct amdgpu_device *adev = f->f_inode->i_private; 1459 + struct amdgpu_device *adev = file_inode(f)->i_private; 1460 1460 ssize_t result = 0; 1461 1461 int r; 1462 1462
+2 -2
drivers/staging/greybus/camera.c
··· 1091 1091 size_t len, loff_t *offset) 1092 1092 { 1093 1093 const struct gb_camera_debugfs_entry *op = file->private_data; 1094 - struct gb_camera *gcam = file->f_inode->i_private; 1094 + struct gb_camera *gcam = file_inode(file)->i_private; 1095 1095 struct gb_camera_debugfs_buffer *buffer; 1096 1096 ssize_t ret; 1097 1097 ··· 1113 1113 loff_t *offset) 1114 1114 { 1115 1115 const struct gb_camera_debugfs_entry *op = file->private_data; 1116 - struct gb_camera *gcam = file->f_inode->i_private; 1116 + struct gb_camera *gcam = file_inode(file)->i_private; 1117 1117 ssize_t ret; 1118 1118 char *kbuf; 1119 1119
+3 -3
drivers/staging/greybus/es2.c
··· 1250 1250 static ssize_t apb_log_read(struct file *f, char __user *buf, 1251 1251 size_t count, loff_t *ppos) 1252 1252 { 1253 - struct es2_ap_dev *es2 = f->f_inode->i_private; 1253 + struct es2_ap_dev *es2 = file_inode(f)->i_private; 1254 1254 ssize_t ret; 1255 1255 size_t copied; 1256 1256 char *tmp_buf; ··· 1304 1304 static ssize_t apb_log_enable_read(struct file *f, char __user *buf, 1305 1305 size_t count, loff_t *ppos) 1306 1306 { 1307 - struct es2_ap_dev *es2 = f->f_inode->i_private; 1307 + struct es2_ap_dev *es2 = file_inode(f)->i_private; 1308 1308 int enable = !IS_ERR_OR_NULL(es2->apb_log_task); 1309 1309 char tmp_buf[3]; 1310 1310 ··· 1317 1317 { 1318 1318 int enable; 1319 1319 ssize_t retval; 1320 - struct es2_ap_dev *es2 = f->f_inode->i_private; 1320 + struct es2_ap_dev *es2 = file_inode(f)->i_private; 1321 1321 1322 1322 retval = kstrtoint_from_user(buf, count, 10, &enable); 1323 1323 if (retval)
+3 -3
drivers/staging/greybus/svc.c
··· 757 757 static ssize_t pwr_debugfs_voltage_read(struct file *file, char __user *buf, 758 758 size_t len, loff_t *offset) 759 759 { 760 - struct svc_debugfs_pwrmon_rail *pwrmon_rails = file->f_inode->i_private; 760 + struct svc_debugfs_pwrmon_rail *pwrmon_rails = file_inode(file)->i_private; 761 761 struct gb_svc *svc = pwrmon_rails->svc; 762 762 int ret, desc; 763 763 u32 value; ··· 780 780 static ssize_t pwr_debugfs_current_read(struct file *file, char __user *buf, 781 781 size_t len, loff_t *offset) 782 782 { 783 - struct svc_debugfs_pwrmon_rail *pwrmon_rails = file->f_inode->i_private; 783 + struct svc_debugfs_pwrmon_rail *pwrmon_rails = file_inode(file)->i_private; 784 784 struct gb_svc *svc = pwrmon_rails->svc; 785 785 int ret, desc; 786 786 u32 value; ··· 803 803 static ssize_t pwr_debugfs_power_read(struct file *file, char __user *buf, 804 804 size_t len, loff_t *offset) 805 805 { 806 - struct svc_debugfs_pwrmon_rail *pwrmon_rails = file->f_inode->i_private; 806 + struct svc_debugfs_pwrmon_rail *pwrmon_rails = file_inode(file)->i_private; 807 807 struct gb_svc *svc = pwrmon_rails->svc; 808 808 int ret, desc; 809 809 u32 value;
+1 -1
drivers/staging/greybus/timesync.c
··· 921 921 static ssize_t gb_timesync_ping_read(struct file *file, char __user *ubuf, 922 922 size_t len, loff_t *offset, bool ktime) 923 923 { 924 - struct gb_timesync_svc *timesync_svc = file->f_inode->i_private; 924 + struct gb_timesync_svc *timesync_svc = file_inode(file)->i_private; 925 925 char *buf; 926 926 ssize_t ret = 0; 927 927
+1 -1
drivers/target/target_core_configfs.c
··· 143 143 pr_err("db_root: cannot open: %s\n", db_root_stage); 144 144 return -EINVAL; 145 145 } 146 - if (!S_ISDIR(fp->f_inode->i_mode)) { 146 + if (!S_ISDIR(file_inode(fp)->i_mode)) { 147 147 filp_close(fp, 0); 148 148 mutex_unlock(&g_tf_lock); 149 149 pr_err("db_root: not a directory: %s\n", db_root_stage);
+3 -3
fs/aio.c
··· 277 277 struct address_space *i_mapping; 278 278 279 279 if (aio_ring_file) { 280 - truncate_setsize(aio_ring_file->f_inode, 0); 280 + truncate_setsize(file_inode(aio_ring_file), 0); 281 281 282 282 /* Prevent further access to the kioctx from migratepages */ 283 - i_mapping = aio_ring_file->f_inode->i_mapping; 283 + i_mapping = aio_ring_file->f_mapping; 284 284 spin_lock(&i_mapping->private_lock); 285 285 i_mapping->private_data = NULL; 286 286 ctx->aio_ring_file = NULL; ··· 483 483 484 484 for (i = 0; i < nr_pages; i++) { 485 485 struct page *page; 486 - page = find_or_create_page(file->f_inode->i_mapping, 486 + page = find_or_create_page(file->f_mapping, 487 487 i, GFP_HIGHUSER | __GFP_ZERO); 488 488 if (!page) 489 489 break;
+1 -1
fs/autofs4/inode.c
··· 94 94 seq_printf(m, ",indirect"); 95 95 #ifdef CONFIG_CHECKPOINT_RESTORE 96 96 if (sbi->pipe) 97 - seq_printf(m, ",pipe_ino=%ld", sbi->pipe->f_inode->i_ino); 97 + seq_printf(m, ",pipe_ino=%ld", file_inode(sbi->pipe)->i_ino); 98 98 else 99 99 seq_printf(m, ",pipe_ino=-1"); 100 100 #endif
+1 -1
fs/fcntl.c
··· 52 52 arg |= O_NONBLOCK; 53 53 54 54 /* Pipe packetized mode is controlled by O_DIRECT flag */ 55 - if (!S_ISFIFO(filp->f_inode->i_mode) && (arg & O_DIRECT)) { 55 + if (!S_ISFIFO(inode->i_mode) && (arg & O_DIRECT)) { 56 56 if (!filp->f_mapping || !filp->f_mapping->a_ops || 57 57 !filp->f_mapping->a_ops->direct_IO) 58 58 return -EINVAL;
+1 -1
fs/orangefs/file.c
··· 724 724 { 725 725 int rc = -EINVAL; 726 726 727 - if (ORANGEFS_SB(filp->f_inode->i_sb)->flags & ORANGEFS_OPT_LOCAL_LOCK) { 727 + if (ORANGEFS_SB(file_inode(filp)->i_sb)->flags & ORANGEFS_OPT_LOCAL_LOCK) { 728 728 if (cmd == F_GETLK) { 729 729 rc = 0; 730 730 posix_test_lock(filp, fl);
+4 -2
fs/orangefs/orangefs-debugfs.c
··· 434 434 char *debug_string; 435 435 struct orangefs_kernel_op_s *new_op = NULL; 436 436 struct client_debug_mask c_mask = { NULL, 0, 0 }; 437 + char *s; 437 438 438 439 gossip_debug(GOSSIP_DEBUGFS_DEBUG, 439 440 "orangefs_debug_write: %pD\n", ··· 522 521 } 523 522 524 523 mutex_lock(&orangefs_debug_lock); 525 - memset(file->f_inode->i_private, 0, ORANGEFS_MAX_DEBUG_STRING_LEN); 526 - sprintf((char *)file->f_inode->i_private, "%s\n", debug_string); 524 + s = file_inode(file)->i_private; 525 + memset(s, 0, ORANGEFS_MAX_DEBUG_STRING_LEN); 526 + sprintf(s, "%s\n", debug_string); 527 527 mutex_unlock(&orangefs_debug_lock); 528 528 529 529 *ppos += count;
+1 -1
fs/overlayfs/copy_up.c
··· 33 33 { 34 34 const struct dentry *dentry = data; 35 35 36 - if (f->f_inode == d_inode(dentry)) 36 + if (file_inode(f) == d_inode(dentry)) 37 37 pr_warn_ratelimited("overlayfs: Warning: Copying up %pD, but open R/O on fd %u which will cease to be coherent [pid=%d %s]\n", 38 38 f, fd, current->pid, current->comm); 39 39 return 0;
+2 -2
kernel/audit_watch.c
··· 548 548 exe_file = get_task_exe_file(tsk); 549 549 if (!exe_file) 550 550 return 0; 551 - ino = exe_file->f_inode->i_ino; 552 - dev = exe_file->f_inode->i_sb->s_dev; 551 + ino = file_inode(exe_file)->i_ino; 552 + dev = file_inode(exe_file)->i_sb->s_dev; 553 553 fput(exe_file); 554 554 return audit_mark_compare(mark, ino, dev); 555 555 }
+1 -1
kernel/events/core.c
··· 6701 6701 struct file *file, unsigned long offset, 6702 6702 unsigned long size) 6703 6703 { 6704 - if (filter->inode != file->f_inode) 6704 + if (filter->inode != file_inode(file)) 6705 6705 return false; 6706 6706 6707 6707 if (filter->offset > offset + size)
+2 -10
kernel/locking/qspinlock_stat.h
··· 108 108 /* 109 109 * Get the counter ID stored in file->f_inode->i_private 110 110 */ 111 - if (!file->f_inode) { 112 - WARN_ON_ONCE(1); 113 - return -EBADF; 114 - } 115 - counter = (long)(file->f_inode->i_private); 111 + counter = (long)file_inode(file)->i_private; 116 112 117 113 if (counter >= qstat_num) 118 114 return -EBADF; ··· 173 177 /* 174 178 * Get the counter ID stored in file->f_inode->i_private 175 179 */ 176 - if (!file->f_inode) { 177 - WARN_ON_ONCE(1); 178 - return -EBADF; 179 - } 180 - if ((long)(file->f_inode->i_private) != qstat_reset_cnts) 180 + if ((long)file_inode(file)->i_private != qstat_reset_cnts) 181 181 return count; 182 182 183 183 for_each_possible_cpu(cpu) {
+1 -1
security/smack/smack_lsm.c
··· 225 225 { 226 226 struct task_smack *tsp = cred->security; 227 227 struct smack_known *sskp = tsp->smk_task; 228 - struct inode *inode = file->f_inode; 228 + struct inode *inode = file_inode(file); 229 229 struct inode_smack *isp = inode->i_security; 230 230 char acc[SMK_NUM_ACCESS_TYPE + 1]; 231 231