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/cifs | |
| 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/cifs')
| -rw-r--r-- | fs/cifs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index b87efd0c92d6..13cf507d1423 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -2154,7 +2154,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) attrs->ia_valid |= ATTR_FORCE; - rc = inode_change_ok(inode, attrs); + rc = setattr_prepare(direntry, attrs); if (rc < 0) goto out; @@ -2294,7 +2294,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) attrs->ia_valid |= ATTR_FORCE; - rc = inode_change_ok(inode, attrs); + rc = setattr_prepare(direntry, attrs); if (rc < 0) { free_xid(xid); return rc; |