LU-4627 llite: deed taking lli_trunc_sem during file write

[fs/lustre-release.git] / lustre / llite / llite_lib.c

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 2331a33..e744390 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -960,7 +960,6 @@ void ll_lli_init(struct ll_inode_info *lli)
                lli->lli_def_acl = NULL;
                spin_lock_init(&lli->lli_sa_lock);
                lli->lli_opendir_pid = 0;
-               lli->lli_lmv_md = NULL;
        } else {
                sema_init(&lli->lli_size_sem, 1);
                lli->lli_size_sem_owner = NULL;
@@ -1696,7 +1695,6 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
                if (attr->ia_valid & ATTR_SIZE)
                        inode_dio_write_done(inode);
                mutex_unlock(&inode->i_mutex);
-               down_write(&lli->lli_trunc_sem);
        }
 
        /* truncate on a released file must failed with -ENODATA,
@@ -1764,7 +1762,11 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
                 * excessive to send mtime/atime updates to OSTs when not
                 * setting times to past, but it is necessary due to possible
                 * time de-synchronization between MDT inode and OST objects */
+               if (attr->ia_valid & ATTR_SIZE)
+                       down_write(&lli->lli_trunc_sem);
                rc = ll_setattr_ost(inode, attr);
+               if (attr->ia_valid & ATTR_SIZE)
+                       up_write(&lli->lli_trunc_sem);
        }
        EXIT;
 out:
@@ -1777,7 +1779,6 @@ out:
                ll_finish_md_op_data(op_data);
        }
        if (!S_ISDIR(inode->i_mode)) {
-               up_write(&lli->lli_trunc_sem);
                mutex_lock(&inode->i_mutex);
                if ((attr->ia_valid & ATTR_SIZE) && !hsm_import)
                        inode_dio_wait(inode);