diff options
| author | Jan Kara <jack@suse.cz> | 2016-05-26 16:55:18 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2016-09-22 10:56:19 +0200 |
| commit | 31051c85b5e2aaaf6315f74c72a732673632a905 (patch) | |
| tree | a3bdc58adf95cd02276f44188f6b33c9f06f5e1a /fs/utimes.c | |
| parent | 62490330769c1ce5dcba3f1f3e8f4005e9b797e6 (diff) | |
| download | linux-stable-31051c85b5e2aaaf6315f74c72a732673632a905.tar.gz linux-stable-31051c85b5e2aaaf6315f74c72a732673632a905.tar.bz2 linux-stable-31051c85b5e2aaaf6315f74c72a732673632a905.zip | |
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/utimes.c')
| -rw-r--r-- | fs/utimes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/utimes.c b/fs/utimes.c index 794f5f5b1fb5..c84b26e46bc5 100644 --- a/fs/utimes.c +++ b/fs/utimes.c @@ -81,7 +81,7 @@ static int utimes_common(struct path *path, struct timespec *times) newattrs.ia_valid |= ATTR_MTIME_SET; } /* - * Tell inode_change_ok(), that this is an explicit time + * Tell setattr_prepare(), that this is an explicit time * update, even if neither ATTR_ATIME_SET nor ATTR_MTIME_SET * were used. */ @@ -90,7 +90,7 @@ static int utimes_common(struct path *path, struct timespec *times) /* * If times is NULL (or both times are UTIME_NOW), * then we need to check permissions, because - * inode_change_ok() won't do it. + * setattr_prepare() won't do it. */ error = -EPERM; if (IS_IMMUTABLE(inode)) |