| .. | .. | 
|---|
| 164 | 164 | * that the blocks allocated and handed out to the client are | 
|---|
| 165 | 165 | * guaranteed to be present even after a server crash. | 
|---|
| 166 | 166 | */ | 
|---|
| 167 |  | -		error = xfs_update_prealloc_flags(ip, | 
|---|
| 168 |  | -				XFS_PREALLOC_SET | XFS_PREALLOC_SYNC); | 
|---|
|  | 167 | +		error = xfs_update_prealloc_flags(ip, XFS_PREALLOC_SET); | 
|---|
|  | 168 | +		if (!error) | 
|---|
|  | 169 | +			error = xfs_log_force_inode(ip); | 
|---|
| 169 | 170 | if (error) | 
|---|
| 170 | 171 | goto out_unlock; | 
|---|
|  | 172 | + | 
|---|
| 171 | 173 | } else { | 
|---|
| 172 | 174 | xfs_iunlock(ip, lock_flags); | 
|---|
| 173 | 175 | } | 
|---|
| .. | .. | 
|---|
| 283 | 285 | xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); | 
|---|
| 284 | 286 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); | 
|---|
| 285 | 287 |  | 
|---|
| 286 |  | -	xfs_setattr_time(ip, iattr); | 
|---|
|  | 288 | +	ASSERT(!(iattr->ia_valid & (ATTR_UID | ATTR_GID))); | 
|---|
|  | 289 | +	setattr_copy(inode, iattr); | 
|---|
| 287 | 290 | if (update_isize) { | 
|---|
| 288 | 291 | i_size_write(inode, iattr->ia_size); | 
|---|
| 289 | 292 | ip->i_d.di_size = iattr->ia_size; | 
|---|