Commit 4013edea authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] knfsd: An assortment of little fixes to the sunrpc cache code 



- in cache_check, h must be non-NULL as it has been de-referenced,
  so don't bother checking for NULL.

- When a cache-item is updated, we need to call cache_revisit_request to see
  if there is a pending request waiting for that item.  We were using
  a transition to CACHE_VALID to see if that was needed, however that is
  wrong as an expired entry will still be marked 'valid' (as the data is valid
  and will need to be released).  So instead use an off transition for
  CACHE_PENDING which is exactly the right thing to test.

- Add a little bit more debugging info.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f9ecc921

net/sunrpc/cache.c

+8 −6
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int cache_check(struct cache_detail *detail, 
	if (rv == -EAGAIN)

		cache_defer_req(rqstp, h);



	if (rv && h)

	if (rv)

		detail->cache_put(h, detail);

	return rv;

}
@@ -223,9 +223,11 @@ void cache_fresh(struct cache_detail *detail, 
	head->last_refresh = get_seconds();

	if (!test_and_set_bit(CACHE_VALID, &head->flags))

		cache_revisit_request(head);

	if (test_and_clear_bit(CACHE_PENDING, &head->flags))

	if (test_and_clear_bit(CACHE_PENDING, &head->flags)) {

		cache_revisit_request(head);

		queue_loose(detail, head);

	}

}



/*

 * caches need to be periodically cleaned.
@@ -551,7 +553,7 @@ static void cache_defer_req(struct cache_req *req, struct cache_head *item) 
		/* there was one too many */

		dreq->revisit(dreq, 1);

	}

	if (test_bit(CACHE_VALID, &item->flags)) {

	if (!test_bit(CACHE_PENDING, &item->flags)) {

		/* must have just been validated... */

		cache_revisit_request(item);

	}
@@ -892,7 +894,7 @@ static void queue_loose(struct cache_detail *detail, struct cache_head *ch) 
			if (cr->item != ch)

				continue;

			if (cr->readers != 0)

				break;

				continue;

			list_del(&cr->q.list);

			spin_unlock(&queue_lock);

			detail->cache_put(cr->item, detail);
@@ -1180,8 +1182,8 @@ static int c_show(struct seq_file *m, void *p) 
		return cd->cache_show(m, cd, NULL);



	ifdebug(CACHE)

		seq_printf(m, "# expiry=%ld refcnt=%d\n",

			   cp->expiry_time, atomic_read(&cp->refcnt));

		seq_printf(m, "# expiry=%ld refcnt=%d flags=%lx\n",

			   cp->expiry_time, atomic_read(&cp->refcnt), cp->flags);

	cache_get(cp);

	if (cache_check(cd, cp, NULL))

		/* cache_check does a cache_put on failure */

CRA Git | Maintained and supported by SUSTech CRA and CCSE