From patchwork Sat Jul 11 12:51:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6770321 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DE53DC05AC for ; Sat, 11 Jul 2015 12:52:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C38C20651 for ; Sat, 11 Jul 2015 12:52:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B1182064F for ; Sat, 11 Jul 2015 12:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753051AbbGKMwB (ORCPT ); Sat, 11 Jul 2015 08:52:01 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:36420 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750855AbbGKMwA (ORCPT ); Sat, 11 Jul 2015 08:52:00 -0400 Received: by pachj5 with SMTP id hj5so6792324pac.3; Sat, 11 Jul 2015 05:52:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=Q6D59jhKX2yzYBPL2Cfc/6bDajBBYra7S9m1f9Jyyg0=; b=tZwB1jnwjN/zxmVWwOYyfFzUqHsFY4MhJazovK9cwxgweT2IV9GiTAKpbq2+cXtI4l 2mJtsfsiGslruNLVWfoFF/1oyowZEKvHAWYpfJBrmfDdkzvvEqTFWa0RHuRGIOY+sjEP X8Aa9fE1jPgzFEJEHqpncgj135FLoj54Fx7N1hL+53WvnWWXaUNiVLQUeGazuxdNSP/2 HX87vkYGr5YaaKVsXFgVBtZdG++bk07InGZh3+zx8RUunPH5NxnloytZn7LDyCq3gLDG BWZjuMlAMqM2rW9ZrUF6BhB+EcPS1/REvWh9A2TS3aEuWHsr6fMx4wfjt+tlk+q6lhr6 ClQg== X-Received: by 10.70.136.196 with SMTP id qc4mr32556356pdb.150.1436619120070; Sat, 11 Jul 2015 05:52:00 -0700 (PDT) Received: from [192.168.99.8] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id ym6sm12872934pac.32.2015.07.11.05.51.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jul 2015 05:51:59 -0700 (PDT) Message-ID: <55A11163.9080506@gmail.com> Date: Sat, 11 Jul 2015 20:51:47 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Al Viro , "J. Bruce Fields" , "linux-nfs@vger.kernel.org" , linux-fsdevel@vger.kernel.org CC: NeilBrown , Trond Myklebust , kinglongmee@gmail.com Subject: [PATCH 09/10 v7] sunrpc: Support get_ref/put_ref for reference change in cache_head References: <55A11010.6050005@gmail.com> In-Reply-To: <55A11010.6050005@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add get_ref/put_ref functions in cache_head for processing reference change (increase/decrease) v7, new one Signed-off-by: Kinglong Mee --- include/linux/sunrpc/cache.h | 15 +++++++++++++-- net/sunrpc/cache.c | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h index 5a4b921..77bc623 100644 --- a/include/linux/sunrpc/cache.h +++ b/include/linux/sunrpc/cache.h @@ -52,6 +52,9 @@ struct cache_head { * was sent, else this is when update was received */ struct kref ref; + void (*get_ref)(struct cache_head *); + void (*put_ref)(struct cache_head *); + unsigned long flags; }; #define CACHE_VALID 0 /* Entry contains valid data */ @@ -187,7 +190,11 @@ extern void cache_clean_deferred(void *owner); static inline struct cache_head *cache_get(struct cache_head *h) { - kref_get(&h->ref); + if (h->get_ref) { + h->get_ref(h); + } else + kref_get(&h->ref); + return h; } @@ -197,7 +204,11 @@ static inline void cache_put(struct cache_head *h, struct cache_detail *cd) if (atomic_read(&h->ref.refcount) <= 2 && h->expiry_time < cd->nextcheck) cd->nextcheck = h->expiry_time; - kref_put(&h->ref, cd->cache_put); + + if (h->put_ref) { + h->put_ref(h); + } else + kref_put(&h->ref, cd->cache_put); } static inline int cache_is_expired(struct cache_detail *detail, struct cache_head *h) diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 8a27483..1ca88b0 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -49,6 +49,8 @@ static void cache_init(struct cache_head *h) kref_init(&h->ref); h->expiry_time = now + CACHE_NEW_EXPIRY; h->last_refresh = now; + h->get_ref = NULL; + h->put_ref = NULL; } struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,