]>
Commit | Line | Data |
---|---|---|
8f69975d BS |
1 | From: Andreas Gruenbacher <agruen@suse.de> |
2 | Subject: Pass struct path down to remove_suid and children | |
3 | ||
4 | Required by a later patch that adds a struct vfsmount parameter to | |
5 | notify_change(). | |
6 | ||
7 | Signed-off-by: Tony Jones <tonyj@suse.de> | |
8 | Signed-off-by: Andreas Gruenbacher <agruen@suse.de> | |
9 | Signed-off-by: John Johansen <jjohansen@suse.de> | |
10 | ||
11 | --- | |
12 | ||
13 | mm/filemap.c | 6 +++--- | |
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | |
15 | ||
16 | --- a/mm/filemap.c | |
17 | +++ b/mm/filemap.c | |
18 | @@ -1826,12 +1826,12 @@ int should_remove_suid(struct dentry *de | |
19 | } | |
20 | EXPORT_SYMBOL(should_remove_suid); | |
21 | ||
22 | -static int __remove_suid(struct dentry *dentry, int kill) | |
23 | +static int __remove_suid(struct path *path, int kill) | |
24 | { | |
25 | struct iattr newattrs; | |
26 | ||
27 | newattrs.ia_valid = ATTR_FORCE | kill; | |
28 | - return notify_change(dentry, &newattrs); | |
29 | + return notify_change(path->dentry, &newattrs); | |
30 | } | |
31 | ||
32 | int file_remove_suid(struct file *file) | |
33 | @@ -1846,7 +1846,7 @@ int file_remove_suid(struct file *file) | |
34 | if (killpriv) | |
35 | error = security_inode_killpriv(dentry); | |
36 | if (!error && killsuid) | |
37 | - error = __remove_suid(dentry, killsuid); | |
38 | + error = __remove_suid(&file->f_path, killsuid); | |
39 | ||
40 | return error; | |
41 | } |