On Wed, 2026-02-04 at 15:57 +1100, NeilBrown wrote: > From: NeilBrown <[email protected]> > > These three function are now only used in namei.c, so they don't need to > be exported. > > Signed-off-by: NeilBrown <[email protected]> > --- > Documentation/filesystems/porting.rst | 7 +++++++ > fs/namei.c | 9 +++------ > include/linux/namei.h | 3 --- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/Documentation/filesystems/porting.rst > b/Documentation/filesystems/porting.rst > index ed86c95d9d01..5f7008172f14 100644 > --- a/Documentation/filesystems/porting.rst > +++ b/Documentation/filesystems/porting.rst > @@ -1347,3 +1347,10 @@ implementation should set it to generic_setlease(). > > lookup_one_qstr_excl() is no longer exported - use start_creating() or > similar. > +--- > + > +** mandatory** > + > +lock_rename(), lock_rename_child(), unlock_rename() are no > +longer available. Use start_renaming() or similar. > + > diff --git a/fs/namei.c b/fs/namei.c > index 307b4d0866b8..0bc82bf90adc 100644 > --- a/fs/namei.c > +++ b/fs/namei.c > @@ -3713,7 +3713,7 @@ static struct dentry *lock_two_directories(struct > dentry *p1, struct dentry *p2) > /* > * p1 and p2 should be directories on the same fs. > */ > -struct dentry *lock_rename(struct dentry *p1, struct dentry *p2) > +static struct dentry *lock_rename(struct dentry *p1, struct dentry *p2) > { > if (p1 == p2) { > inode_lock_nested(p1->d_inode, I_MUTEX_PARENT); > @@ -3723,12 +3723,11 @@ struct dentry *lock_rename(struct dentry *p1, struct > dentry *p2) > mutex_lock(&p1->d_sb->s_vfs_rename_mutex); > return lock_two_directories(p1, p2); > } > -EXPORT_SYMBOL(lock_rename); > > /* > * c1 and p2 should be on the same fs. > */ > -struct dentry *lock_rename_child(struct dentry *c1, struct dentry *p2) > +static struct dentry *lock_rename_child(struct dentry *c1, struct dentry *p2) > { > if (READ_ONCE(c1->d_parent) == p2) { > /* > @@ -3765,9 +3764,8 @@ struct dentry *lock_rename_child(struct dentry *c1, > struct dentry *p2) > mutex_unlock(&c1->d_sb->s_vfs_rename_mutex); > return NULL; > } > -EXPORT_SYMBOL(lock_rename_child); > > -void unlock_rename(struct dentry *p1, struct dentry *p2) > +static void unlock_rename(struct dentry *p1, struct dentry *p2) > { > inode_unlock(p1->d_inode); > if (p1 != p2) { > @@ -3775,7 +3773,6 @@ void unlock_rename(struct dentry *p1, struct dentry *p2) > mutex_unlock(&p1->d_sb->s_vfs_rename_mutex); > } > } > -EXPORT_SYMBOL(unlock_rename); > > /** > * __start_renaming - lookup and lock names for rename > diff --git a/include/linux/namei.h b/include/linux/namei.h > index c7a7288cdd25..2ad6dd9987b9 100644 > --- a/include/linux/namei.h > +++ b/include/linux/namei.h > @@ -165,9 +165,6 @@ extern int follow_down_one(struct path *); > extern int follow_down(struct path *path, unsigned int flags); > extern int follow_up(struct path *); > > -extern struct dentry *lock_rename(struct dentry *, struct dentry *); > -extern struct dentry *lock_rename_child(struct dentry *, struct dentry *); > -extern void unlock_rename(struct dentry *, struct dentry *); > int start_renaming(struct renamedata *rd, int lookup_flags, > struct qstr *old_last, struct qstr *new_last); > int start_renaming_dentry(struct renamedata *rd, int lookup_flags,
Reviewed-by: Jeff Layton <[email protected]>
