diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:06:08 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:06:08 -0400 |
| commit | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch) | |
| tree | 406a3c127abb008f2f736c8d2ee03fc3c2926d6b /fs/ocfs2/file.c | |
| parent | f334bcd94b7d3c0fbc34d518a86548f451ab5faf (diff) | |
| parent | 030b533c4fd4d2ec3402363323de4bb2983c9cee (diff) | |
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'fs/ocfs2/file.c')
| -rw-r--r-- | fs/ocfs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 0b055bfb8e86..8a7eb81dcdfc 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
| @@ -1155,7 +1155,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 1155 | if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) | 1155 | if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) |
| 1156 | return 0; | 1156 | return 0; |
| 1157 | 1157 | ||
| 1158 | status = inode_change_ok(inode, attr); | 1158 | status = setattr_prepare(dentry, attr); |
| 1159 | if (status) | 1159 | if (status) |
| 1160 | return status; | 1160 | return status; |
| 1161 | 1161 | ||