git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
69b90b5
)
ocfs2: ->e_leaf_clusters endianness breakage
author
Al Viro
<viro@zeniv.linux.org.uk>
Fri, 13 Apr 2012 16:30:02 +0000
(12:30 -0400)
committer
Ben Hutchings
<ben@decadent.org.uk>
Fri, 11 May 2012 12:14:14 +0000
(13:14 +0100)
commit
72094e43e3af5020510f920321d71f1798fa896d
upstream.
le16, not le32...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/ocfs2/suballoc.c
patch
|
blob
|
history
diff --git
a/fs/ocfs2/suballoc.c
b/fs/ocfs2/suballoc.c
index
ba5d97e
..
f169da4
100644
(file)
--- 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),
ret = ocfs2_free_clusters(handle, cluster_ac->ac_inode,
cluster_ac->ac_bh,
le64_to_cpu(rec->e_blkno),
- le
32
_to_cpu(rec->e_leaf_clusters));
+ le
16
_to_cpu(rec->e_leaf_clusters));
if (ret)
mlog_errno(ret);
/* Try all the clusters to free */
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 bpc = le16_to_cpu(cl->cl_bpc);
unsigned int bitoff = le32_to_cpu(rec->e_cpos) * bpc;
- unsigned int bitcount = le
32
_to_cpu(rec->e_leaf_clusters) * bpc;
+ unsigned int bitcount = le
16
_to_cpu(rec->e_leaf_clusters) * bpc;
if (res->sr_bit_offset < bitoff)
return 0;
if (res->sr_bit_offset < bitoff)
return 0;