diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-23 00:22:39 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-23 00:22:39 +0400 |
| commit | 2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (patch) | |
| tree | 08470935de327cb438cc9ec738b0e025c3c0b556 /fs/ubifs/lprops.c | |
| parent | 2efa1d59fe5af81456393472121623c9502548ce (diff) | |
| parent | 947d299686aa9cc8aecf749d54e8475c6e498956 (diff) | |
| download | linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'fs/ubifs/lprops.c')
| -rw-r--r-- | fs/ubifs/lprops.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c index e5a2a35a46dc..46190a7c42a6 100644 --- a/fs/ubifs/lprops.c +++ b/fs/ubifs/lprops.c @@ -300,8 +300,11 @@ void ubifs_add_to_cat(struct ubifs_info *c, struct ubifs_lprops *lprops, 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 ubifs_info *c, default: ubifs_assert(0); } + + c->in_a_category_cnt -= 1; + ubifs_assert(c->in_a_category_cnt >= 0); } /** |