diff options
| author | Al Viro | 2016-10-08 17:06:08 +0200 |
|---|---|---|
| committer | Al Viro | 2016-10-08 17:06:08 +0200 |
| commit | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch) | |
| tree | 406a3c127abb008f2f736c8d2ee03fc3c2926d6b /drivers/staging | |
| parent | Merge remote-tracking branch 'ovl/misc' into work.misc (diff) | |
| parent | fs: Avoid premature clearing of capabilities (diff) | |
| download | kernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.gz kernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.xz kernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.zip | |
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/llite_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index 546063e728db..fb7b54eff027 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -1192,7 +1192,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) attr->ia_valid |= ATTR_MTIME | ATTR_CTIME; } - /* POSIX: check before ATTR_*TIME_SET set (from inode_change_ok) */ + /* POSIX: check before ATTR_*TIME_SET set (from setattr_prepare) */ if (attr->ia_valid & TIMES_SET_FLAGS) { if ((!uid_eq(current_fsuid(), inode->i_uid)) && !capable(CFS_CAP_FOWNER)) |