[ 3.5.y.z extended stable ] Patch "libceph: use pg_num_mask instead of pgp_num_mask for pg.seed" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Fri Sep 20 19:35:35 UTC 2013


This is a note to let you know that I have just added a patch titled

    libceph: use pg_num_mask instead of pgp_num_mask for pg.seed

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From b9668049d30c497bd20cfadbc0eaadfff3a25f1c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage at inktank.com>
Date: Wed, 28 Aug 2013 17:17:29 -0700
Subject: [PATCH] libceph: use pg_num_mask instead of pgp_num_mask for pg.seed
 calc

commit 9542cf0bf9b1a3adcc2ef271edbcbdba03abf345 upstream.

Fix a typo that used the wrong bitmask for the pg.seed calculation.  This
is normally unnoticed because in most cases pg_num == pgp_num.  It is, however,
a bug that is easily corrected.

Signed-off-by: Sage Weil <sage at inktank.com>
Reviewed-by: Alex Elder <alex.elder at linary.org>
[ luis: backported to 3.5: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 net/ceph/osdmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index d10a72b..dfedfd8 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -1064,7 +1064,7 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,

 	/* pg_temp? */
 	t = ceph_stable_mod(ps, le32_to_cpu(pool->v.pg_num),
-			    pool->pgp_num_mask);
+			    pool->pg_num_mask);
 	pgid.ps = cpu_to_le16(t);
 	pg = __lookup_pg_mapping(&osdmap->pg_temp, pgid);
 	if (pg) {
--
1.8.3.2





More information about the kernel-team mailing list