From patchwork Mon Jul 13 09:31:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6776891 Return-Path: X-Original-To: patchwork-linux-nfs@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 6456CC05AC for ; Mon, 13 Jul 2015 09:31:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2AB120547 for ; Mon, 13 Jul 2015 09:31:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8F2720553 for ; Mon, 13 Jul 2015 09:31:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751097AbbGMJbs (ORCPT ); Mon, 13 Jul 2015 05:31:48 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:34297 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751096AbbGMJbr (ORCPT ); Mon, 13 Jul 2015 05:31:47 -0400 Received: by pacan13 with SMTP id an13so13060030pac.1 for ; Mon, 13 Jul 2015 02:31:47 -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=3dTdWgyClxcJiYtc61EAYj2Ha817msqcdkw0nb2qOEs=; b=ZgMsvofZKBMyowHIb9lzQw6EBi+HSifVPsYdYSNjCgWqFAfvpTer1dGjV7VhBMTFff GWbYeKb7uW4YxnnC3zKQmdEG6dXvVsKu2WDkqu+D+w62YqiVYYfz0Z5I9FZp/HK4AuIx OcJsHiR3MitHasC4P1AqGFi9goArwKXGhGCpqaK6iQYRFPKCHzoRFozQfZgb5cQipmns 0RB6hUFClbFFxF8qwdwLkJ09j36yjvi2EontSbAuIaCno1rgw6fQGbVKEb1+6S7qqYZH L+EyZ3hvLPWfNcm3Z9LciowjGeqjgHKKv+sw3brV8oi6aZlh9hF++FkMCw8bisAKqpF8 M5Xg== X-Received: by 10.66.100.233 with SMTP id fb9mr66109233pab.128.1436779907309; Mon, 13 Jul 2015 02:31:47 -0700 (PDT) Received: from [192.168.99.19] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id ra10sm18215906pab.19.2015.07.13.02.31.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2015 02:31:46 -0700 (PDT) Message-ID: <55A3857E.50104@gmail.com> Date: Mon, 13 Jul 2015 17:31:42 +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: "J. Bruce Fields" , "linux-nfs@vger.kernel.org" CC: kinglongmee@gmail.com Subject: [PATCH 06/14] nfsd: Drop duplicate locks_init_lock() References: <55A384B1.8030207@gmail.com> In-Reply-To: <55A384B1.8030207@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.2 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=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 Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4layouts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 5c0f1d6..c5af4ccb 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -162,7 +162,7 @@ nfsd4_layout_setlease(struct nfs4_layout_stateid *ls) fl = locks_alloc_lock(); if (!fl) return -ENOMEM; - locks_init_lock(fl); + fl->fl_lmops = &nfsd4_layouts_lm_ops; fl->fl_flags = FL_LAYOUT; fl->fl_type = F_RDLCK;