diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
| commit | 1203868ffa16d93234dc005fba95b6596b87ddb5 (patch) | |
| tree | 0e24f2baa99515d0045998361a2294e2b2b25484 /drivers/staging/lustre/lustre/llite/llite_lib.c | |
| parent | 03b862ce80d27a26f8add26a547b3dc7b4d561d6 (diff) | |
| parent | 054f8fe34189a62a0b87700c062a18c3a8421615 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-17.03-androidlsk-v3.18-17.02-android
Diffstat (limited to 'drivers/staging/lustre/lustre/llite/llite_lib.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/llite_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index f4ca7b753021..500af356a033 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -1504,7 +1504,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) if (attr->ia_valid & (ATTR_SIZE | ATTR_ATIME | ATTR_ATIME_SET | - ATTR_MTIME | ATTR_MTIME_SET)) + ATTR_MTIME | ATTR_MTIME_SET)) { /* For truncate and utimes sending attributes to OSTs, setting * mtime/atime to the past will be performed under PW [0:EOF] * extent lock (new_size:EOF for truncate). It may seem @@ -1516,6 +1516,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) rc = ll_setattr_ost(inode, attr); if (attr->ia_valid & ATTR_SIZE) up_write(&lli->lli_trunc_sem); + } out: if (op_data) { if (op_data->op_ioepoch) { |