diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-30 11:58:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-30 11:58:30 +0100 |
| commit | 5eb3fdca6ca7667a73d52adfd047d94e8b8b105e (patch) | |
| tree | c935b3fa5b47c9d70e0e66c7cc7830e74988b13f /drivers/android | |
| parent | f60deca1c3741ab8fcf318a7bb82a3d026ea7c49 (diff) | |
| parent | 84086827932b58e7645d93d970bbc566c4ee408b (diff) | |
| download | linux-next-5eb3fdca6ca7667a73d52adfd047d94e8b8b105e.tar.gz linux-next-5eb3fdca6ca7667a73d52adfd047d94e8b8b105e.zip | |
Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
# Conflicts:
# fs/smb/server/smb2pdu.c
# fs/smb/server/vfs.c
# fs/smb/server/vfs.h
Diffstat (limited to 'drivers/android')
| -rw-r--r-- | drivers/android/binder/rust_binderfs.c | 2 | ||||
| -rw-r--r-- | drivers/android/binderfs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/android/binder/rust_binderfs.c b/drivers/android/binder/rust_binderfs.c index 300cc65562d1..e98e6ca163df 100644 --- a/drivers/android/binder/rust_binderfs.c +++ b/drivers/android/binder/rust_binderfs.c @@ -338,7 +338,7 @@ static inline bool is_binderfs_control_device(const struct dentry *dentry) return info->control_dentry == dentry; } -static int binderfs_rename(struct mnt_idmap *idmap, +static int binderfs_rename(const struct mnt_idmap *idmap, struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c index 361d69f756f5..087eae6ca8ec 100644 --- a/drivers/android/binderfs.c +++ b/drivers/android/binderfs.c @@ -344,7 +344,7 @@ static inline bool is_binderfs_control_device(const struct dentry *dentry) return info->control_dentry == dentry; } -static int binderfs_rename(struct mnt_idmap *idmap, +static int binderfs_rename(const struct mnt_idmap *idmap, struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) |