mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-07 18:40:10 +00:00
VFS: rename kern_path_locked() and related functions.
kern_path_locked() is now only used to prepare for removing an object from the filesystem (and that is the only credible reason for wanting a positive locked dentry). Thus it corresponds to kern_path_create() and so should have a corresponding name. Unfortunately the name "kern_path_create" is somewhat misleading as it doesn't actually create anything. The recently added simple_start_creating() provides a better pattern I believe. The "start" can be matched with "end" to bracket the creating or removing. So this patch changes names: kern_path_locked -> start_removing_path kern_path_create -> start_creating_path user_path_create -> start_creating_user_path user_path_locked_at -> start_removing_user_path_at done_path_create -> end_creating_path and also introduces end_removing_path() which is identical to end_creating_path(). __start_removing_path (which was __kern_path_locked) is enhanced to call mnt_want_write() for consistency with the start_creating_path(). Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: NeilBrown <neil@brown.name> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
committed by
Christian Brauner
parent
76a53de6f7
commit
3d18f80ce1
@@ -1387,7 +1387,7 @@ static int unix_bind_bsd(struct sock *sk, struct sockaddr_un *sunaddr,
|
||||
* Get the parent directory, calculate the hash for last
|
||||
* component.
|
||||
*/
|
||||
dentry = kern_path_create(AT_FDCWD, addr->name->sun_path, &parent, 0);
|
||||
dentry = start_creating_path(AT_FDCWD, addr->name->sun_path, &parent, 0);
|
||||
if (IS_ERR(dentry)) {
|
||||
err = PTR_ERR(dentry);
|
||||
goto out;
|
||||
@@ -1417,7 +1417,7 @@ static int unix_bind_bsd(struct sock *sk, struct sockaddr_un *sunaddr,
|
||||
unix_table_double_unlock(net, old_hash, new_hash);
|
||||
unix_insert_bsd_socket(sk);
|
||||
mutex_unlock(&u->bindlock);
|
||||
done_path_create(&parent, dentry);
|
||||
end_creating_path(&parent, dentry);
|
||||
return 0;
|
||||
|
||||
out_unlock:
|
||||
@@ -1427,7 +1427,7 @@ out_unlink:
|
||||
/* failed after successful mknod? unlink what we'd created... */
|
||||
vfs_unlink(idmap, d_inode(parent.dentry), dentry, NULL);
|
||||
out_path:
|
||||
done_path_create(&parent, dentry);
|
||||
end_creating_path(&parent, dentry);
|
||||
out:
|
||||
unix_release_addr(addr);
|
||||
return err == -EEXIST ? -EADDRINUSE : err;
|
||||
|
||||
Reference in New Issue
Block a user