GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ceph: define snap counts as u32 everywhere

Browse source 
There are two structures in which a count of snapshots are
maintained:

    struct ceph_snap_context {
	...
        u32 num_snaps;
	...
    }
and
    struct ceph_snap_realm {
	...
        u32 num_prior_parent_snaps;   /*  had prior to parent_since */
	...
        u32 num_snaps;
	...
    }

These fields never take on negative values (e.g., to hold special
meaning), and so are really inherently unsigned.  Furthermore they
take their value from over-the-wire or on-disk formatted 32-bit
values.

So change their definition to have type u32, and change some spots
elsewhere in the code to account for this change.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2012-07-13 20:35:11 -05:00 • committed by Sage Weil
parent bd919d45aa
commit aa711ee340
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
fs/ceph/snap.c
View file

@ -296,8 +296,7 @@ static int build_snap_context(struct ceph_snap_realm *realm)
struct ceph_snap_realm *parent = realm->parent; struct ceph_snap_realm *parent = realm->parent;
struct ceph_snap_context *snapc; struct ceph_snap_context *snapc;
int err = 0; int err = 0;
int i; u32 num = realm->num_prior_parent_snaps + realm->num_snaps;
int num = realm->num_prior_parent_snaps + realm->num_snaps;
/* /*
* build parent context, if it hasn't been built. * build parent context, if it hasn't been built.
@ -321,11 +320,11 @@ static int build_snap_context(struct ceph_snap_realm *realm)
realm->cached_context->seq == realm->seq && realm->cached_context->seq == realm->seq &&
(!parent || (!parent ||
realm->cached_context->seq >= parent->cached_context->seq)) { realm->cached_context->seq >= parent->cached_context->seq)) {
dout("build_snap_context %llx %p: %p seq %lld (%d snaps)" dout("build_snap_context %llx %p: %p seq %lld (%u snaps)"
" (unchanged)\n", " (unchanged)\n",
realm->ino, realm, realm->cached_context, realm->ino, realm, realm->cached_context,
realm->cached_context->seq, realm->cached_context->seq,
realm->cached_context->num_snaps); (unsigned int) realm->cached_context->num_snaps);
return 0; return 0;
} }
@ -342,6 +341,8 @@ static int build_snap_context(struct ceph_snap_realm *realm)
num = 0; num = 0;
snapc->seq = realm->seq; snapc->seq = realm->seq;
if (parent) { if (parent) {
u32 i;
/* include any of parent's snaps occurring _after_ my /* include any of parent's snaps occurring _after_ my
parent became my parent */ parent became my parent */
for (i = 0; i < parent->cached_context->num_snaps; i++) for (i = 0; i < parent->cached_context->num_snaps; i++)
@ -361,8 +362,9 @@ static int build_snap_context(struct ceph_snap_realm *realm)
sort(snapc->snaps, num, sizeof(u64), cmpu64_rev, NULL); sort(snapc->snaps, num, sizeof(u64), cmpu64_rev, NULL);
snapc->num_snaps = num; snapc->num_snaps = num;
dout("build_snap_context %llx %p: %p seq %lld (%d snaps)\n", dout("build_snap_context %llx %p: %p seq %lld (%u snaps)\n",
realm->ino, realm, snapc, snapc->seq, snapc->num_snaps); realm->ino, realm, snapc, snapc->seq,
(unsigned int) snapc->num_snaps);
if (realm->cached_context) if (realm->cached_context)
ceph_put_snap_context(realm->cached_context); ceph_put_snap_context(realm->cached_context);
@ -402,9 +404,9 @@ static void rebuild_snap_realms(struct ceph_snap_realm *realm)
* helper to allocate and decode an array of snapids. free prior * helper to allocate and decode an array of snapids. free prior
* instance, if any. * instance, if any.
*/ */
static int dup_array(u64 **dst, __le64 *src, int num) static int dup_array(u64 **dst, __le64 *src, u32 num)
{ {
int i; u32 i;
kfree(*dst); kfree(*dst);
if (num) { if (num) {

4
fs/ceph/super.h
View file

@ -612,9 +612,9 @@ struct ceph_snap_realm {
u64 parent_since; /* snapid when our current parent became so */ u64 parent_since; /* snapid when our current parent became so */
u64 *prior_parent_snaps; /* snaps inherited from any parents we */ u64 *prior_parent_snaps; /* snaps inherited from any parents we */
int num_prior_parent_snaps; /* had prior to parent_since */ u32 num_prior_parent_snaps; /* had prior to parent_since */
u64 *snaps; /* snaps specific to this realm */ u64 *snaps; /* snaps specific to this realm */
int num_snaps; u32 num_snaps;
struct ceph_snap_realm *parent; struct ceph_snap_realm *parent;
struct list_head children; /* list of child realms */ struct list_head children; /* list of child realms */

2
include/linux/ceph/libceph.h
View file

@ -154,7 +154,7 @@ struct ceph_client {
struct ceph_snap_context { struct ceph_snap_context {
atomic_t nref; atomic_t nref;
u64 seq; u64 seq;
int num_snaps; u32 num_snaps;
u64 snaps[]; u64 snaps[];
}; };