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

[PATCH] don't pass nameidata to gfs2_lookupi()

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

Al Viro a569c711 2ad94ae6

+8 -8
unified split
+3 -3
fs/gfs2/inode.c
··· 448 448 struct qstr qstr; 449 449 struct inode *inode; 450 450 gfs2_str2qstr(&qstr, name); 451 - inode = gfs2_lookupi(dip, &qstr, 1, NULL); 451 + inode = gfs2_lookupi(dip, &qstr, 1); 452 452 /* gfs2_lookupi has inconsistent callers: vfs 453 453 * related routines expect NULL for no entry found, 454 454 * gfs2_lookup_simple callers expect ENOENT ··· 477 477 */ 478 478 479 479 struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, 480 - int is_root, struct nameidata *nd) 480 + int is_root) 481 481 { 482 482 struct super_block *sb = dir->i_sb; 483 483 struct gfs2_inode *dip = GFS2_I(dir); ··· 1173 1173 break; 1174 1174 } 1175 1175 1176 - tmp = gfs2_lookupi(dir, &dotdot, 1, NULL); 1176 + tmp = gfs2_lookupi(dir, &dotdot, 1); 1177 1177 if (IS_ERR(tmp)) { 1178 1178 error = PTR_ERR(tmp); 1179 1179 break;
+1 -1
fs/gfs2/inode.h
··· 83 83 int gfs2_dinode_dealloc(struct gfs2_inode *inode); 84 84 int gfs2_change_nlink(struct gfs2_inode *ip, int diff); 85 85 struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, 86 - int is_root, struct nameidata *nd); 86 + int is_root); 87 87 struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, 88 88 unsigned int mode, dev_t dev); 89 89 int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name,
+1 -1
fs/gfs2/ops_export.c
··· 134 134 struct dentry *dentry; 135 135 136 136 gfs2_str2qstr(&dotdot, ".."); 137 - inode = gfs2_lookupi(child->d_inode, &dotdot, 1, NULL); 137 + inode = gfs2_lookupi(child->d_inode, &dotdot, 1); 138 138 139 139 if (!inode) 140 140 return ERR_PTR(-ENOENT);
+2 -2
fs/gfs2/ops_inode.c
··· 74 74 return PTR_ERR(inode); 75 75 } 76 76 77 - inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd); 77 + inode = gfs2_lookupi(dir, &dentry->d_name, 0); 78 78 if (inode) { 79 79 if (!IS_ERR(inode)) { 80 80 gfs2_holder_uninit(ghs); ··· 109 109 110 110 dentry->d_op = &gfs2_dops; 111 111 112 - inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd); 112 + inode = gfs2_lookupi(dir, &dentry->d_name, 0); 113 113 if (inode && IS_ERR(inode)) 114 114 return ERR_CAST(inode); 115 115
+1 -1
fs/gfs2/super.c
··· 389 389 break; 390 390 391 391 INIT_LIST_HEAD(&jd->extent_list); 392 - jd->jd_inode = gfs2_lookupi(sdp->sd_jindex, &name, 1, NULL); 392 + jd->jd_inode = gfs2_lookupi(sdp->sd_jindex, &name, 1); 393 393 if (!jd->jd_inode || IS_ERR(jd->jd_inode)) { 394 394 if (!jd->jd_inode) 395 395 error = -ENOENT;