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

getting rid of 'opened' argument of ->atomic_open() - part 1

'opened' argument of finish_open() is unused. Kill it.

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

Al Viro be12af3e 6035a27b

+12 -14
+1 -1
fs/9p/vfs_inode.c
··· 917 917 v9inode->writeback_fid = (void *) inode_fid; 918 918 } 919 919 mutex_unlock(&v9inode->v_mutex); 920 - err = finish_open(file, dentry, generic_file_open, opened); 920 + err = finish_open(file, dentry, generic_file_open); 921 921 if (err) 922 922 goto error; 923 923
+1 -1
fs/9p/vfs_inode_dotl.c
··· 352 352 } 353 353 mutex_unlock(&v9inode->v_mutex); 354 354 /* Since we are opening a file, assign the open fid to the file */ 355 - err = finish_open(file, dentry, generic_file_open, opened); 355 + err = finish_open(file, dentry, generic_file_open); 356 356 if (err) 357 357 goto err_clunk_old_fid; 358 358 file->private_data = ofid;
+1 -1
fs/ceph/file.c
··· 509 509 ceph_init_inode_acls(d_inode(dentry), &acls); 510 510 file->f_mode |= FMODE_CREATED; 511 511 } 512 - err = finish_open(file, dentry, ceph_open, opened); 512 + err = finish_open(file, dentry, ceph_open); 513 513 } 514 514 out_req: 515 515 if (!req->r_err && req->r_target_inode)
+1 -1
fs/cifs/dir.c
··· 541 541 if ((oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) 542 542 file->f_mode |= FMODE_CREATED; 543 543 544 - rc = finish_open(file, direntry, generic_file_open, opened); 544 + rc = finish_open(file, direntry, generic_file_open); 545 545 if (rc) { 546 546 if (server->ops->close) 547 547 server->ops->close(xid, tcon, &fid);
+1 -1
fs/fuse/dir.c
··· 469 469 d_instantiate(entry, inode); 470 470 fuse_change_entry_timeout(entry, &outentry); 471 471 fuse_invalidate_attr(dir); 472 - err = finish_open(file, entry, generic_file_open, opened); 472 + err = finish_open(file, entry, generic_file_open); 473 473 if (err) { 474 474 fuse_sync_release(ff, flags); 475 475 } else {
+3 -3
fs/gfs2/inode.c
··· 626 626 error = 0; 627 627 if (file) { 628 628 if (S_ISREG(inode->i_mode)) 629 - error = finish_open(file, dentry, gfs2_open_common, opened); 629 + error = finish_open(file, dentry, gfs2_open_common); 630 630 else 631 631 error = finish_no_open(file, NULL); 632 632 } ··· 768 768 d_instantiate(dentry, inode); 769 769 if (file) { 770 770 file->f_mode |= FMODE_CREATED; 771 - error = finish_open(file, dentry, gfs2_open_common, opened); 771 + error = finish_open(file, dentry, gfs2_open_common); 772 772 } 773 773 gfs2_glock_dq_uninit(ghs); 774 774 gfs2_glock_dq_uninit(ghs + 1); ··· 866 866 return d; 867 867 } 868 868 if (file && S_ISREG(inode->i_mode)) 869 - error = finish_open(file, dentry, gfs2_open_common, opened); 869 + error = finish_open(file, dentry, gfs2_open_common); 870 870 871 871 gfs2_glock_dq_uninit(&gh); 872 872 if (error) {
+1 -1
fs/namei.c
··· 3475 3475 if (error) 3476 3476 goto out2; 3477 3477 file->f_path.mnt = path.mnt; 3478 - error = finish_open(file, child, NULL, opened); 3478 + error = finish_open(file, child, NULL); 3479 3479 out2: 3480 3480 mnt_drop_write(path.mnt); 3481 3481 out:
+1 -1
fs/nfs/dir.c
··· 1439 1439 { 1440 1440 int err; 1441 1441 1442 - err = finish_open(file, dentry, do_open, opened); 1442 + err = finish_open(file, dentry, do_open); 1443 1443 if (err) 1444 1444 goto out; 1445 1445 if (S_ISREG(file->f_path.dentry->d_inode->i_mode))
+1 -2
fs/open.c
··· 843 843 * Returns zero on success or -errno if the open failed. 844 844 */ 845 845 int finish_open(struct file *file, struct dentry *dentry, 846 - int (*open)(struct inode *, struct file *), 847 - int *opened) 846 + int (*open)(struct inode *, struct file *)) 848 847 { 849 848 BUG_ON(file->f_mode & FMODE_OPENED); /* once it's opened, it's opened */ 850 849
+1 -2
include/linux/fs.h
··· 2441 2441 FILE_OPENED = 2 2442 2442 }; 2443 2443 extern int finish_open(struct file *file, struct dentry *dentry, 2444 - int (*open)(struct inode *, struct file *), 2445 - int *opened); 2444 + int (*open)(struct inode *, struct file *)); 2446 2445 extern int finish_no_open(struct file *file, struct dentry *dentry); 2447 2446 2448 2447 /* fs/ioctl.c */