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/ocfs2 | |
| parent | 62490330769c1ce5dcba3f1f3e8f4005e9b797e6 (diff) | |
| download | linux-31051c85b5e2aaaf6315f74c72a732673632a905.tar.gz linux-31051c85b5e2aaaf6315f74c72a732673632a905.tar.bz2 linux-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/ocfs2')
| -rw-r--r-- | fs/ocfs2/dlmfs/dlmfs.c | 2 | ||||
| -rw-r--r-- | fs/ocfs2/file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index ef474cdd6404..6a4b21654037 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -211,7 +211,7 @@ static int dlmfs_file_setattr(struct dentry *dentry, struct iattr *attr) struct inode *inode = d_inode(dentry); attr->ia_valid &= ~ATTR_SIZE; - error = inode_change_ok(inode, attr); + error = setattr_prepare(dentry, attr); if (error) return error; diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 4e7b0dc22450..1ab3657242e8 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1155,7 +1155,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; - status = inode_change_ok(inode, attr); + status = setattr_prepare(dentry, attr); if (status) return status; |