mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From c38877f92a9e0858b5a4902440cef2c0df1b1632 Mon Sep 17 00:00:00 2001
|
|
From: Al Viro <viro@zeniv.linux.org.uk>
|
|
Date: Fri, 13 Apr 2012 12:30:02 -0400
|
|
Subject: [PATCH 054/165] ocfs2: ->e_leaf_clusters endianness breakage
|
|
|
|
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 | 4 ++--
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
|
|
index ba5d97e..f169da4 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;
|
|
--
|
|
1.7.7.6
|
|
|