[PATCH] jffs2: add sparse annotations for the erase_completion_lock

From: Harvey Harrison
Date: Thu May 29 2008 - 21:49:56 EST


Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
---
fs/jffs2/gc.c | 2 ++
fs/jffs2/nodemgmt.c | 4 ++++
fs/jffs2/summary.c | 2 ++
3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index 090c556..6312a67 100644
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -39,6 +39,8 @@ static int jffs2_garbage_collect_live(struct jffs2_sb_info *c, struct jffs2_era

/* Called with erase_completion_lock held */
static struct jffs2_eraseblock *jffs2_find_gc_block(struct jffs2_sb_info *c)
+__releases(&c->erase_completion_lock)
+__acquires(&c->erase_completion_lock)
{
struct jffs2_eraseblock *ret;
struct list_head *nextlist = NULL;
diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index a9bf960..728c8aa 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -204,6 +204,8 @@ static void jffs2_close_nextblock(struct jffs2_sb_info *c, struct jffs2_eraseblo
/* Select a new jeb for nextblock */

static int jffs2_find_nextblock(struct jffs2_sb_info *c)
+__releases(&c->erase_completion_lock)
+__acquires(&c->erase_completion_lock)
{
struct list_head *next;

@@ -269,6 +271,8 @@ static int jffs2_find_nextblock(struct jffs2_sb_info *c)
/* Called with alloc sem _and_ erase_completion_lock */
static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,
uint32_t *len, uint32_t sumsize)
+__releases(&c->erase_completion_lock)
+__acquires(&c->erase_completion_lock)
{
struct jffs2_eraseblock *jeb = c->nextblock;
uint32_t reserved_size; /* for summary information at the end of the jeb */
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 629af01..8410b6c 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -818,6 +818,8 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock
/* Write out summary information - called from jffs2_do_reserve_space */

int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)
+__releases(&c->erase_completion_lock)
+__acquires(&c->erase_completion_lock)
{
int datasize, infosize, padsize;
struct jffs2_eraseblock *jeb;
--
1.5.6.rc0.277.g804cf



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/