Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro: "In this pile: pathname resolution rewrite. - recursion in link_path_walk() is gone. - nesting limits on symlinks are gone (the only limit remaining is that the total amount of symlinks is no more than 40, no matter how nested). - "fast" (inline) symlinks are handled without leaving rcuwalk mode. - stack footprint (independent of the nesting) is below kilobyte now, about on par with what it used to be with one level of nested symlinks and ~2.8 times lower than it used to be in the worst case. - struct nameidata is entirely private to fs/namei.c now (not even opaque pointers are being passed around). - ->follow_link() and ->put_link() calling conventions had been changed; all in-tree filesystems converted, out-of-tree should be able to follow reasonably easily. For out-of-tree conversions, see Documentation/filesystems/porting for details (and in-tree filesystems for examples of conversion). That has sat in -next since mid-May, seems to survive all testing without regressions and merges clean with v4.1" * 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (131 commits) turn user_{path_at,path,lpath,path_dir}() into static inlines namei: move saved_nd pointer into struct nameidata inline user_path_create() inline user_path_parent() namei: trim do_last() arguments namei: stash dfd and name into nameidata namei: fold path_cleanup() into terminate_walk() namei: saner calling conventions for filename_parentat() namei: saner calling conventions for filename_create() namei: shift nameidata down into filename_parentat() namei: make filename_lookup() reject ERR_PTR() passed as name namei: shift nameidata inside filename_lookup() namei: move putname() call into filename_lookup() namei: pass the struct path to store the result down into path_lookupat() namei: uninline set_root{,_rcu}() namei: be careful with mountpoint crossings in follow_dotdot_rcu() Documentation: remove outdated information from automount-support.txt get rid of assorted nameidata-related debris lustre: kill unused helper lustre: kill unused macro (LOOKUP_CONTINUE) ...
This commit is contained in:
@@ -892,7 +892,7 @@ static const struct inode_operations hostfs_dir_iops = {
|
||||
.setattr = hostfs_setattr,
|
||||
};
|
||||
|
||||
static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
static const char *hostfs_follow_link(struct dentry *dentry, void **cookie)
|
||||
{
|
||||
char *link = __getname();
|
||||
if (link) {
|
||||
@@ -906,21 +906,18 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
}
|
||||
if (err < 0) {
|
||||
__putname(link);
|
||||
link = ERR_PTR(err);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
} else {
|
||||
link = ERR_PTR(-ENOMEM);
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
nd_set_link(nd, link);
|
||||
return NULL;
|
||||
return *cookie = link;
|
||||
}
|
||||
|
||||
static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
|
||||
static void hostfs_put_link(struct inode *unused, void *cookie)
|
||||
{
|
||||
char *s = nd_get_link(nd);
|
||||
if (!IS_ERR(s))
|
||||
__putname(s);
|
||||
__putname(cookie);
|
||||
}
|
||||
|
||||
static const struct inode_operations hostfs_link_iops = {
|
||||
|
Reference in New Issue
Block a user