From 684aae1272e272c00210b7895d9e5c1fcfd6d061 Mon Sep 17 00:00:00 2001
From: Noah Watkins <noah@noahdesu.com>
Date: Wed, 28 Oct 2009 14:04:48 -0700
Subject: [PATCH] --- yaml --- r: 188596 b: refs/heads/master c:
 35e054a66e07f508aa7cfabc7db1757379093689 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ceph/osdmap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 203ce017fc45..7aa2a55788e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbbccec9c6218cbc9ff47c6d88bfc6b52079e3ea
+refs/heads/master: 35e054a66e07f508aa7cfabc7db1757379093689
diff --git a/trunk/fs/ceph/osdmap.c b/trunk/fs/ceph/osdmap.c
index 72d75a239ac2..60012e05bdfd 100644
--- a/trunk/fs/ceph/osdmap.c
+++ b/trunk/fs/ceph/osdmap.c
@@ -735,7 +735,7 @@ void ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
 
 	dout("mapping %llu~%llu  osize %u fl_su %u\n", off, *plen,
 	     osize, su);
-	su_per_object = osize / le32_to_cpu(layout->fl_stripe_unit);
+	su_per_object = osize / su;
 	dout("osize %u / su %u = su_per_object %u\n", osize, su,
 	     su_per_object);