mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
new ->follow_link() and ->put_link() calling conventions
a) instead of storing the symlink body (via nd_set_link()) and returning an opaque pointer later passed to ->put_link(), ->follow_link() _stores_ that opaque pointer (into void * passed by address by caller) and returns the symlink body. Returning ERR_PTR() on error, NULL on jump (procfs magic symlinks) and pointer to symlink body for normal symlinks. Stored pointer is ignored in all cases except the last one. Storing NULL for opaque pointer (or not storing it at all) means no call of ->put_link(). b) the body used to be passed to ->put_link() implicitly (via nameidata). Now only the opaque pointer is. In the cases when we used the symlink body to free stuff, ->follow_link() now should store it as opaque pointer in addition to returning it. Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
46afd6f61c
commit
680baacbca
31 changed files with 195 additions and 273 deletions
|
|
@ -279,30 +279,26 @@ static int configfs_getlink(struct dentry *dentry, char * path)
|
|||
|
||||
}
|
||||
|
||||
static void *configfs_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
static const char *configfs_follow_link(struct dentry *dentry, void **cookie, struct nameidata *nd)
|
||||
{
|
||||
int error = -ENOMEM;
|
||||
unsigned long page = get_zeroed_page(GFP_KERNEL);
|
||||
int error;
|
||||
|
||||
if (page) {
|
||||
error = configfs_getlink(dentry, (char *)page);
|
||||
if (!error) {
|
||||
nd_set_link(nd, (char *)page);
|
||||
return (void *)page;
|
||||
}
|
||||
if (!page)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
error = configfs_getlink(dentry, (char *)page);
|
||||
if (!error) {
|
||||
return *cookie = (void *)page;
|
||||
}
|
||||
|
||||
nd_set_link(nd, ERR_PTR(error));
|
||||
return NULL;
|
||||
free_page(page);
|
||||
return ERR_PTR(error);
|
||||
}
|
||||
|
||||
static void configfs_put_link(struct dentry *dentry, struct nameidata *nd,
|
||||
void *cookie)
|
||||
static void configfs_put_link(struct dentry *dentry, void *cookie)
|
||||
{
|
||||
if (cookie) {
|
||||
unsigned long page = (unsigned long)cookie;
|
||||
free_page(page);
|
||||
}
|
||||
free_page((unsigned long)cookie);
|
||||
}
|
||||
|
||||
const struct inode_operations configfs_symlink_inode_operations = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue