|
@@ -1506,7 +1506,8 @@ static int ocfs2_zero_partial_clusters(struct inode *inode,
|
|
|
u64 start, u64 len)
|
|
|
{
|
|
|
int ret = 0;
|
|
|
- u64 tmpend, end = start + len;
|
|
|
+ u64 tmpend = 0;
|
|
|
+ u64 end = start + len;
|
|
|
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
|
|
|
unsigned int csize = osb->s_clustersize;
|
|
|
handle_t *handle;
|
|
@@ -1538,18 +1539,31 @@ static int ocfs2_zero_partial_clusters(struct inode *inode,
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
- * We want to get the byte offset of the end of the 1st cluster.
|
|
|
+ * If start is on a cluster boundary and end is somewhere in another
|
|
|
+ * cluster, we have not COWed the cluster starting at start, unless
|
|
|
+ * end is also within the same cluster. So, in this case, we skip this
|
|
|
+ * first call to ocfs2_zero_range_for_truncate() truncate and move on
|
|
|
+ * to the next one.
|
|
|
*/
|
|
|
- tmpend = (u64)osb->s_clustersize + (start & ~(osb->s_clustersize - 1));
|
|
|
- if (tmpend > end)
|
|
|
- tmpend = end;
|
|
|
+ if ((start & (csize - 1)) != 0) {
|
|
|
+ /*
|
|
|
+ * We want to get the byte offset of the end of the 1st
|
|
|
+ * cluster.
|
|
|
+ */
|
|
|
+ tmpend = (u64)osb->s_clustersize +
|
|
|
+ (start & ~(osb->s_clustersize - 1));
|
|
|
+ if (tmpend > end)
|
|
|
+ tmpend = end;
|
|
|
|
|
|
- trace_ocfs2_zero_partial_clusters_range1((unsigned long long)start,
|
|
|
- (unsigned long long)tmpend);
|
|
|
+ trace_ocfs2_zero_partial_clusters_range1(
|
|
|
+ (unsigned long long)start,
|
|
|
+ (unsigned long long)tmpend);
|
|
|
|
|
|
- ret = ocfs2_zero_range_for_truncate(inode, handle, start, tmpend);
|
|
|
- if (ret)
|
|
|
- mlog_errno(ret);
|
|
|
+ ret = ocfs2_zero_range_for_truncate(inode, handle, start,
|
|
|
+ tmpend);
|
|
|
+ if (ret)
|
|
|
+ mlog_errno(ret);
|
|
|
+ }
|
|
|
|
|
|
if (tmpend < end) {
|
|
|
/*
|