From patchwork Fri Apr 10 13:46:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6196751 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 0CA84BF4A6 for ; Fri, 10 Apr 2015 13:47:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 179EF20353 for ; Fri, 10 Apr 2015 13:47:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DB2520351 for ; Fri, 10 Apr 2015 13:47:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965614AbbDJNq7 (ORCPT ); Fri, 10 Apr 2015 09:46:59 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:33013 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934287AbbDJNq3 (ORCPT ); Fri, 10 Apr 2015 09:46:29 -0400 Received: by pdbnk13 with SMTP id nk13so23363027pdb.0; Fri, 10 Apr 2015 06:46:28 -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 :content-type:content-transfer-encoding; bh=G1fXQrr0uqhtrqcRwzkE1kTU5oqyKYjVgqNxG7/3wSg=; b=o+dU7+N7F7yEHUlQqbi9eCSZ/qO2lh14fVUk5cU3dPtCS/z9g7TKbJ/S6LiYBdkBUi Mff0k9zngvLGIQtKqYBsZEiP6n8C6QHWsyPBhUiaY9WzOAlLB2KntuMISuqihFmoiaPk 1kH1FJwuhHDt93bTL1r8qURIuoxlgwk3cyIBtmWBAIW1wDtON8Gh9qN+s8pA2125AG24 qLu4xrVvfyHSRG32UnAPe9uZCSih6A+wctCZid5mZ2ECO9kJi0GT67MTqIj6tn+Xo1IA /Sqhn+E7e4oN/Buu9ZdwNtFjHbLY+QnA4tvxKi4ojdmSAOuulq2WaojUA6FDpq8eghu4 cUIw== X-Received: by 10.70.101.226 with SMTP id fj2mr2864514pdb.23.1428673588896; Fri, 10 Apr 2015 06:46:28 -0700 (PDT) Received: from [192.168.99.16] ([104.143.41.79]) by mx.google.com with ESMTPSA id hk6sm2361177pdb.83.2015.04.10.06.46.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2015 06:46:28 -0700 (PDT) Message-ID: <5527D42A.800@gmail.com> Date: Fri, 10 Apr 2015 21:46:18 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: David Howells CC: linux-fsdevel@vger.kernel.org, "linux-nfs@vger.kernel.org" , kinglongmee@gmail.com Subject: [PATCH] fscache: Don't override netfs->primary_index if register failed Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Only override netfs->primary_index when registering success. Note: this patch is made with, "[PATCH] fscache: put reference of parent's usage and n_children" Signed-off-by: Kinglong Mee --- fs/fscache/netfs.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/fs/fscache/netfs.c b/fs/fscache/netfs.c index b16afba..b935250 100644 --- a/fs/fscache/netfs.c +++ b/fs/fscache/netfs.c @@ -22,6 +22,7 @@ static LIST_HEAD(fscache_netfs_list); int __fscache_register_netfs(struct fscache_netfs *netfs) { struct fscache_netfs *ptr; + struct fscache_cookie *cookie; int ret; _enter("{%s}", netfs->name); @@ -29,29 +30,28 @@ int __fscache_register_netfs(struct fscache_netfs *netfs) INIT_LIST_HEAD(&netfs->link); /* allocate a cookie for the primary index */ - netfs->primary_index = - kmem_cache_zalloc(fscache_cookie_jar, GFP_KERNEL); + cookie = kmem_cache_zalloc(fscache_cookie_jar, GFP_KERNEL); - if (!netfs->primary_index) { + if (!cookie) { _leave(" = -ENOMEM"); return -ENOMEM; } /* initialise the primary index cookie */ - atomic_set(&netfs->primary_index->usage, 1); - atomic_set(&netfs->primary_index->n_children, 0); - atomic_set(&netfs->primary_index->n_active, 1); + atomic_set(&cookie->usage, 1); + atomic_set(&cookie->n_children, 0); + atomic_set(&cookie->n_active, 1); - netfs->primary_index->def = &fscache_fsdef_netfs_def; - netfs->primary_index->parent = &fscache_fsdef_index; - netfs->primary_index->netfs_data = netfs; - netfs->primary_index->flags = 1 << FSCACHE_COOKIE_ENABLED; + cookie->def = &fscache_fsdef_netfs_def; + cookie->parent = &fscache_fsdef_index; + cookie->netfs_data = netfs; + cookie->flags = 1 << FSCACHE_COOKIE_ENABLED; - atomic_inc(&netfs->primary_index->parent->usage); - atomic_inc(&netfs->primary_index->parent->n_children); + atomic_inc(&cookie->parent->usage); + atomic_inc(&cookie->parent->n_children); - spin_lock_init(&netfs->primary_index->lock); - INIT_HLIST_HEAD(&netfs->primary_index->backing_objects); + spin_lock_init(&cookie->lock); + INIT_HLIST_HEAD(&cookie->backing_objects); /* check the netfs type is not already present */ down_write(&fscache_addremove_sem); @@ -62,6 +62,7 @@ int __fscache_register_netfs(struct fscache_netfs *netfs) goto already_registered; } + netfs->primary_index = cookie; list_add(&netfs->link, &fscache_netfs_list); ret = 0; @@ -69,11 +70,8 @@ int __fscache_register_netfs(struct fscache_netfs *netfs) already_registered: up_write(&fscache_addremove_sem); - - if (ret < 0) { - fscache_relinquish_cookie(netfs->primary_index, 0); - netfs->primary_index = NULL; - } + if (ret < 0) + fscache_relinquish_cookie(cookie, 0); _leave(" = %d", ret); return ret;