diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-05-14 12:20:17 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-05-14 12:20:17 -0400 |
| commit | 29b116b9e177cd4403d607c3e4d4e5df8f6e365d (patch) | |
| tree | 3c6b7dcadada9cb9f91ec8fe67612dc8f95756c3 /fs/ocfs2/suballoc.c | |
| parent | b0abc660848cf2fdc08231982a641c8cd5da2393 (diff) | |
| parent | a2cfa87491c4ef47de3c4e0973ebb457019a3963 (diff) | |
Merge tag 'v3.2.17' into v3.2-rt
This is the 3.2.17 stable release
Diffstat (limited to 'fs/ocfs2/suballoc.c')
| -rw-r--r-- | fs/ocfs2/suballoc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c index ba5d97e4a73e..f169da4624fd 100644 --- a/fs/ocfs2/suballoc.c +++ b/fs/ocfs2/suballoc.c @@ -600,7 +600,7 @@ static void ocfs2_bg_alloc_cleanup(handle_t *handle, ret = ocfs2_free_clusters(handle, cluster_ac->ac_inode, cluster_ac->ac_bh, le64_to_cpu(rec->e_blkno), - le32_to_cpu(rec->e_leaf_clusters)); + le16_to_cpu(rec->e_leaf_clusters)); if (ret) mlog_errno(ret); /* Try all the clusters to free */ @@ -1628,7 +1628,7 @@ static int ocfs2_bg_discontig_fix_by_rec(struct ocfs2_suballoc_result *res, { unsigned int bpc = le16_to_cpu(cl->cl_bpc); unsigned int bitoff = le32_to_cpu(rec->e_cpos) * bpc; - unsigned int bitcount = le32_to_cpu(rec->e_leaf_clusters) * bpc; + unsigned int bitcount = le16_to_cpu(rec->e_leaf_clusters) * bpc; if (res->sr_bit_offset < bitoff) return 0; |