From: NeilBrown <[email protected]> These are no longer used, so remove them.
Signed-off-by: NeilBrown <[email protected]> --- Documentation/filesystems/porting.rst | 7 +++ fs/ecryptfs/inode.c | 2 +- fs/namei.c | 61 ++------------------------- include/linux/namei.h | 2 - 4 files changed, 12 insertions(+), 60 deletions(-) diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst index 154a38cd7801..7e83bd3c5a12 100644 --- a/Documentation/filesystems/porting.rst +++ b/Documentation/filesystems/porting.rst @@ -1396,3 +1396,10 @@ and d_alloc_parallel() or d_alloc_noblock() when standard interfaces can be used d_rehash() is gone. It should never be needed. Only unhash a dentry if you really don't want it. +--- + +** mandatory** + +lookup_one() and lookup_noperm() are no longer available. Use +start_creating() or similar instead. + diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index beb9e2c8b8b3..a7a596d51d67 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -414,7 +414,7 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode, lower_dentry = lookup_noperm_unlocked(&qname, lower_dir_dentry); if (IS_ERR(lower_dentry)) { - ecryptfs_printk(KERN_DEBUG, "%s: lookup_noperm() returned " + ecryptfs_printk(KERN_DEBUG, "%s: lookup_noperm_unlocked() returned " "[%ld] on lower_dentry = [%s]\n", __func__, PTR_ERR(lower_dentry), qname.name); diff --git a/fs/namei.c b/fs/namei.c index eed388ee8a30..cb80490a869f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3148,59 +3148,6 @@ struct dentry *try_lookup_noperm(struct qstr *name, struct dentry *base) } EXPORT_SYMBOL(try_lookup_noperm); -/** - * lookup_noperm - filesystem helper to lookup single pathname component - * @name: qstr storing pathname component to lookup - * @base: base directory to lookup from - * - * Note that this routine is purely a helper for filesystem usage and should - * not be called by generic code. It does no permission checking. - * - * The caller must hold base->i_rwsem. - */ -struct dentry *lookup_noperm(struct qstr *name, struct dentry *base) -{ - struct dentry *dentry; - int err; - - WARN_ON_ONCE(!inode_is_locked(base->d_inode)); - - err = lookup_noperm_common(name, base); - if (err) - return ERR_PTR(err); - - dentry = lookup_dcache(name, base, 0); - return dentry ? dentry : __lookup_slow(name, base, 0); -} -EXPORT_SYMBOL(lookup_noperm); - -/** - * lookup_one - lookup single pathname component - * @idmap: idmap of the mount the lookup is performed from - * @name: qstr holding pathname component to lookup - * @base: base directory to lookup from - * - * This can be used for in-kernel filesystem clients such as file servers. - * - * The caller must hold base->i_rwsem. - */ -struct dentry *lookup_one(struct mnt_idmap *idmap, struct qstr *name, - struct dentry *base) -{ - struct dentry *dentry; - int err; - - WARN_ON_ONCE(!inode_is_locked(base->d_inode)); - - err = lookup_one_common(idmap, name, base); - if (err) - return ERR_PTR(err); - - dentry = lookup_dcache(name, base, 0); - return dentry ? dentry : __lookup_slow(name, base, 0); -} -EXPORT_SYMBOL(lookup_one); - /** * lookup_one_unlocked - lookup single pathname component * @idmap: idmap of the mount the lookup is performed from @@ -3209,8 +3156,8 @@ EXPORT_SYMBOL(lookup_one); * * This can be used for in-kernel filesystem clients such as file servers. * - * Unlike lookup_one, it should be called without the parent - * i_rwsem held, and will take the i_rwsem itself if necessary. + * It should be called without the parent i_rwsem held, and will take + * the i_rwsem itself if necessary. * * Returns: - A dentry, possibly negative, or * - same errors as try_lookup_noperm() or @@ -3322,8 +3269,8 @@ EXPORT_SYMBOL(lookup_one_positive_unlocked); * Note that this routine is purely a helper for filesystem usage and should * not be called by generic code. It does no permission checking. * - * Unlike lookup_noperm(), it should be called without the parent - * i_rwsem held, and will take the i_rwsem itself if necessary. + * This should be called without the parent i_rwsem held, and will take + * the i_rwsem itself if necessary. * * Unlike try_lookup_noperm() it *does* revalidate the dentry if it already * existed. diff --git a/include/linux/namei.h b/include/linux/namei.h index b3346a513d8f..cb79e84c718d 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -74,10 +74,8 @@ int vfs_path_lookup(struct dentry *, struct vfsmount *, const char *, unsigned int, struct path *); extern struct dentry *try_lookup_noperm(struct qstr *, struct dentry *); -extern struct dentry *lookup_noperm(struct qstr *, struct dentry *); extern struct dentry *lookup_noperm_unlocked(struct qstr *, struct dentry *); extern struct dentry *lookup_noperm_positive_unlocked(struct qstr *, struct dentry *); -struct dentry *lookup_one(struct mnt_idmap *, struct qstr *, struct dentry *); struct dentry *lookup_one_unlocked(struct mnt_idmap *idmap, struct qstr *name, struct dentry *base); struct dentry *lookup_one_positive_unlocked(struct mnt_idmap *idmap, -- 2.50.0.107.gf914562f5916.dirty
