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 /fs/proc/generic.c | |
| 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 'fs/proc/generic.c')
| -rw-r--r-- | fs/proc/generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 26086a283672..2b1971da4a85 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -117,7 +117,7 @@ static bool pde_subdir_insert(struct proc_dir_entry *dir, return true; } -static int proc_setattr(struct mnt_idmap *idmap, struct dentry *dentry, +static int proc_setattr(const struct mnt_idmap *idmap, struct dentry *dentry, struct iattr *iattr) { struct inode *inode = d_inode(dentry); @@ -135,7 +135,7 @@ static int proc_setattr(struct mnt_idmap *idmap, struct dentry *dentry, return 0; } -static int proc_getattr(struct mnt_idmap *idmap, +static int proc_getattr(const struct mnt_idmap *idmap, const struct path *path, struct kstat *stat, u32 request_mask, unsigned int query_flags) { |