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 2

__gfs2_lookup(), gfs2_create_inode(), nfs_finish_open() and fuse_create_open()
don't need 'opened' anymore. Get rid of that argument in those.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro b452a458 be12af3e

+13 -15
+2 -2
fs/fuse/dir.c
··· 399 399 */ 400 400 static int fuse_create_open(struct inode *dir, struct dentry *entry, 401 401 struct file *file, unsigned flags, 402 - umode_t mode, int *opened) 402 + umode_t mode) 403 403 { 404 404 int err; 405 405 struct inode *inode; ··· 513 513 if (fc->no_create) 514 514 goto mknod; 515 515 516 - err = fuse_create_open(dir, entry, file, flags, mode, opened); 516 + err = fuse_create_open(dir, entry, file, flags, mode); 517 517 if (err == -ENOSYS) { 518 518 fc->no_create = 1; 519 519 goto mknod;
+9 -10
fs/gfs2/inode.c
··· 580 580 static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, 581 581 struct file *file, 582 582 umode_t mode, dev_t dev, const char *symname, 583 - unsigned int size, int excl, int *opened) 583 + unsigned int size, int excl) 584 584 { 585 585 const struct qstr *name = &dentry->d_name; 586 586 struct posix_acl *default_acl, *acl; ··· 822 822 static int gfs2_create(struct inode *dir, struct dentry *dentry, 823 823 umode_t mode, bool excl) 824 824 { 825 - return gfs2_create_inode(dir, dentry, NULL, S_IFREG | mode, 0, NULL, 0, excl, NULL); 825 + return gfs2_create_inode(dir, dentry, NULL, S_IFREG | mode, 0, NULL, 0, excl); 826 826 } 827 827 828 828 /** ··· 830 830 * @dir: The directory inode 831 831 * @dentry: The dentry of the new inode 832 832 * @file: File to be opened 833 - * @opened: atomic_open flags 834 833 * 835 834 * 836 835 * Returns: errno 837 836 */ 838 837 839 838 static struct dentry *__gfs2_lookup(struct inode *dir, struct dentry *dentry, 840 - struct file *file, int *opened) 839 + struct file *file) 841 840 { 842 841 struct inode *inode; 843 842 struct dentry *d; ··· 878 879 static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry, 879 880 unsigned flags) 880 881 { 881 - return __gfs2_lookup(dir, dentry, NULL, NULL); 882 + return __gfs2_lookup(dir, dentry, NULL); 882 883 } 883 884 884 885 /** ··· 1188 1189 if (size >= gfs2_max_stuffed_size(GFS2_I(dir))) 1189 1190 return -ENAMETOOLONG; 1190 1191 1191 - return gfs2_create_inode(dir, dentry, NULL, S_IFLNK | S_IRWXUGO, 0, symname, size, 0, NULL); 1192 + return gfs2_create_inode(dir, dentry, NULL, S_IFLNK | S_IRWXUGO, 0, symname, size, 0); 1192 1193 } 1193 1194 1194 1195 /** ··· 1203 1204 static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 1204 1205 { 1205 1206 unsigned dsize = gfs2_max_stuffed_size(GFS2_I(dir)); 1206 - return gfs2_create_inode(dir, dentry, NULL, S_IFDIR | mode, 0, NULL, dsize, 0, NULL); 1207 + return gfs2_create_inode(dir, dentry, NULL, S_IFDIR | mode, 0, NULL, dsize, 0); 1207 1208 } 1208 1209 1209 1210 /** ··· 1218 1219 static int gfs2_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, 1219 1220 dev_t dev) 1220 1221 { 1221 - return gfs2_create_inode(dir, dentry, NULL, mode, dev, NULL, 0, 0, NULL); 1222 + return gfs2_create_inode(dir, dentry, NULL, mode, dev, NULL, 0, 0); 1222 1223 } 1223 1224 1224 1225 /** ··· 1243 1244 if (!d_in_lookup(dentry)) 1244 1245 goto skip_lookup; 1245 1246 1246 - d = __gfs2_lookup(dir, dentry, file, opened); 1247 + d = __gfs2_lookup(dir, dentry, file); 1247 1248 if (IS_ERR(d)) 1248 1249 return PTR_ERR(d); 1249 1250 if (d != NULL) ··· 1261 1262 if (!(flags & O_CREAT)) 1262 1263 return -ENOENT; 1263 1264 1264 - return gfs2_create_inode(dir, dentry, file, S_IFREG | mode, 0, NULL, 0, excl, opened); 1265 + return gfs2_create_inode(dir, dentry, file, S_IFREG | mode, 0, NULL, 0, excl); 1265 1266 } 1266 1267 1267 1268 /*
+2 -3
fs/nfs/dir.c
··· 1434 1434 1435 1435 static int nfs_finish_open(struct nfs_open_context *ctx, 1436 1436 struct dentry *dentry, 1437 - struct file *file, unsigned open_flags, 1438 - int *opened) 1437 + struct file *file, unsigned open_flags) 1439 1438 { 1440 1439 int err; 1441 1440 ··· 1548 1549 goto out; 1549 1550 } 1550 1551 1551 - err = nfs_finish_open(ctx, ctx->dentry, file, open_flags, opened); 1552 + err = nfs_finish_open(ctx, ctx->dentry, file, open_flags); 1552 1553 trace_nfs_atomic_open_exit(dir, ctx, open_flags, err); 1553 1554 put_nfs_open_context(ctx); 1554 1555 out: