diff options
| author | Jan Kara <jack@suse.cz> | 2016-05-26 16:55:18 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:53:52 +0000 |
| commit | 50b070e8224f7bf86622ede1abee9fa3d3dc2f10 (patch) | |
| tree | 5ff484c283569ca0f0cff13448675d1e63b0a1a4 /fs/reiserfs | |
| parent | 2dd45cd109b0a950f1022f8fbddae2383b6015a0 (diff) | |
| download | linux-stable-50b070e8224f7bf86622ede1abee9fa3d3dc2f10.tar.gz linux-stable-50b070e8224f7bf86622ede1abee9fa3d3dc2f10.tar.bz2 linux-stable-50b070e8224f7bf86622ede1abee9fa3d3dc2f10.zip | |
fs: Give dentry to inode_change_ok() instead of inode
commit 31051c85b5e2aaaf6315f74c72a732673632a905 upstream.
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>
[bwh: Backported to 3.16:
- Drop changes to orangefs, overlayfs
- Adjust filenames, context
- In nfsd, pass dentry to nfsd_sanitize_attrs()
- Update ext3 as well]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 63b2b0ec49e6..27b402e05aa2 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -3312,7 +3312,7 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) unsigned int ia_valid; int error; - error = inode_change_ok(inode, attr); + error = setattr_prepare(dentry, attr); if (error) return error; |