diff options
author | Jan Kara <jack@suse.cz> | 2016-05-26 10:55:18 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2016-09-22 04:56:19 -0400 |
commit | 31051c85b5e2aaaf6315f74c72a732673632a905 (patch) | |
tree | a3bdc58adf95cd02276f44188f6b33c9f06f5e1a /fs/proc | |
parent | 62490330769c1ce5dcba3f1f3e8f4005e9b797e6 (diff) |
fs: Give dentry to inode_change_ok() instead of inode
inode_change_ok() will be resposible for clearing capabilities and IMA
extended attributes and as such will need dentry. Give it as an argument
to inode_change_ok() instead of an inode. Also rename inode_change_ok()
to setattr_prepare() to better relect that it does also some
modifications in addition to checks.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/base.c | 2 | ||||
-rw-r--r-- | fs/proc/generic.c | 2 | ||||
-rw-r--r-- | fs/proc/proc_sysctl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 54e270262979..207f36039f63 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -709,7 +709,7 @@ int proc_setattr(struct dentry *dentry, struct iattr *attr) | |||
709 | if (attr->ia_valid & ATTR_MODE) | 709 | if (attr->ia_valid & ATTR_MODE) |
710 | return -EPERM; | 710 | return -EPERM; |
711 | 711 | ||
712 | error = inode_change_ok(inode, attr); | 712 | error = setattr_prepare(dentry, attr); |
713 | if (error) | 713 | if (error) |
714 | return error; | 714 | return error; |
715 | 715 | ||
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index c633476616e0..23ff30e3c1e7 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -105,7 +105,7 @@ static int proc_notify_change(struct dentry *dentry, struct iattr *iattr) | |||
105 | struct proc_dir_entry *de = PDE(inode); | 105 | struct proc_dir_entry *de = PDE(inode); |
106 | int error; | 106 | int error; |
107 | 107 | ||
108 | error = inode_change_ok(inode, iattr); | 108 | error = setattr_prepare(dentry, iattr); |
109 | if (error) | 109 | if (error) |
110 | return error; | 110 | return error; |
111 | 111 | ||
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 1b93650dda2f..268fcf592b0e 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c | |||
@@ -754,7 +754,7 @@ static int proc_sys_setattr(struct dentry *dentry, struct iattr *attr) | |||
754 | if (attr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID)) | 754 | if (attr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID)) |
755 | return -EPERM; | 755 | return -EPERM; |
756 | 756 | ||
757 | error = inode_change_ok(inode, attr); | 757 | error = setattr_prepare(dentry, attr); |
758 | if (error) | 758 | if (error) |
759 | return error; | 759 | return error; |
760 | 760 | ||