lkml.org 
[lkml]   [2012]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 022/171] UBIFS: introduce categorized lprops counter
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

    commit 98a1eebda3cb2a84ecf1f219bb3a95769033d1bf upstream.

    This commit is a preparation for a subsequent bugfix. We introduce a
    counter for categorized lprops.

    Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ubifs/lprops.c | 6 ++++++
    fs/ubifs/ubifs.h | 3 +++
    2 files changed, 9 insertions(+)

    --- a/fs/ubifs/lprops.c
    +++ b/fs/ubifs/lprops.c
    @@ -300,8 +300,11 @@ void ubifs_add_to_cat(struct ubifs_info
    default:
    ubifs_assert(0);
    }
    +
    lprops->flags &= ~LPROPS_CAT_MASK;
    lprops->flags |= cat;
    + c->in_a_category_cnt += 1;
    + ubifs_assert(c->in_a_category_cnt <= c->main_lebs);
    }

    /**
    @@ -334,6 +337,9 @@ static void ubifs_remove_from_cat(struct
    default:
    ubifs_assert(0);
    }
    +
    + c->in_a_category_cnt -= 1;
    + ubifs_assert(c->in_a_category_cnt >= 0);
    }

    /**
    --- a/fs/ubifs/ubifs.h
    +++ b/fs/ubifs/ubifs.h
    @@ -1184,6 +1184,8 @@ struct ubifs_debug_info;
    * @freeable_list: list of freeable non-index LEBs (free + dirty == @leb_size)
    * @frdi_idx_list: list of freeable index LEBs (free + dirty == @leb_size)
    * @freeable_cnt: number of freeable LEBs in @freeable_list
    + * @in_a_category_cnt: count of lprops which are in a certain category, which
    + * basically meants that they were loaded from the flash
    *
    * @ltab_lnum: LEB number of LPT's own lprops table
    * @ltab_offs: offset of LPT's own lprops table
    @@ -1413,6 +1415,7 @@ struct ubifs_info {
    struct list_head freeable_list;
    struct list_head frdi_idx_list;
    int freeable_cnt;
    + int in_a_category_cnt;

    int ltab_lnum;
    int ltab_offs;



    \
     
     \ /
      Last update: 2012-11-23 00:01    [W:4.078 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site