|
@@ -1161,6 +1161,13 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
|
|
|
}
|
|
|
size_change = S_ISREG(inode->i_mode) && attr->ia_valid & ATTR_SIZE;
|
|
|
if (size_change) {
|
|
|
+ /*
|
|
|
+ * Here we should wait dio to finish before inode lock
|
|
|
+ * to avoid a deadlock between ocfs2_setattr() and
|
|
|
+ * ocfs2_dio_end_io_write()
|
|
|
+ */
|
|
|
+ inode_dio_wait(inode);
|
|
|
+
|
|
|
status = ocfs2_rw_lock(inode, 1);
|
|
|
if (status < 0) {
|
|
|
mlog_errno(status);
|
|
@@ -1200,8 +1207,6 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
|
|
|
if (status)
|
|
|
goto bail_unlock;
|
|
|
|
|
|
- inode_dio_wait(inode);
|
|
|
-
|
|
|
if (i_size_read(inode) >= attr->ia_size) {
|
|
|
if (ocfs2_should_order_data(inode)) {
|
|
|
status = ocfs2_begin_ordered_truncate(inode,
|