From patchwork Wed Aug 6 13:38:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 4686241 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1CC85C0338 for ; Wed, 6 Aug 2014 13:39:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 312262010F for ; Wed, 6 Aug 2014 13:39:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 256102010E for ; Wed, 6 Aug 2014 13:39:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752364AbaHFNi6 (ORCPT ); Wed, 6 Aug 2014 09:38:58 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:58276 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbaHFNi6 (ORCPT ); Wed, 6 Aug 2014 09:38:58 -0400 Received: by mail-pd0-f171.google.com with SMTP id z10so3345325pdj.2 for ; Wed, 06 Aug 2014 06:38:57 -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=UaSoUfjcy+fkM56LuiOYeLCVOpNPMI47h+bo4gmAJBw=; b=CMYuokl0Pa0k6sttGUkb1tCrNiuvjpcnU2D0hbIuwMdPZumctqzEBGMCwOeBO2WJXD 1Ck9gkPeHJ9y3uv6VOVsqUYC2MP14k925lqCu5AxejknszOKYCxYw433jDfNBDQGn+ZC ICYjkLw6+82Jr2+wgu66Q2OD30T4HvtpJVAY55W7TahvOtVdSWNi0lanr8r28nA+OYd8 vnkTkDxz3JF3jKF9mki9BrBL4puErzpNd9JBtfjhvX0zMZ12bxzxCn8nkLdo7Y4zYTWZ gKWGl8mR5UeEkflm3R8uMKu/3WOs5pK9B+xnwPat/GqWypAeLuRZNaD9pdCL5pt0hjdN sMzA== X-Received: by 10.66.124.199 with SMTP id mk7mr11477403pab.89.1407332337466; Wed, 06 Aug 2014 06:38:57 -0700 (PDT) Received: from [192.168.0.100] ([110.190.119.243]) by mx.google.com with ESMTPSA id pn4sm1367388pbb.7.2014.08.06.06.38.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Aug 2014 06:38:56 -0700 (PDT) Message-ID: <53E22FDD.4090900@gmail.com> Date: Wed, 06 Aug 2014 21:38:37 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Linux NFS Mailing List , Trond Myklebust , jlayton@redhat.com, linux-fsdevel@vger.kernel.org, kinglongmee@gmail.com Subject: [PATCH 3/3 RFC] fs/locks.c: Copy all infomation for conflock References: <53BAAAC5.9000106@gmail.com> <53E22EA5.70708@gmail.com> <53E22F2C.8070900@gmail.com> In-Reply-To: <53E22F2C.8070900@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=-7.5 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 Make sure copy the private information by fl_copy_lock() in struct file_lock_operations, use locks_copy_lock copying all information for conflock. Signed-off-by: Kinglong Mee --- fs/lockd/svclock.c | 2 +- fs/locks.c | 27 ++++++--------------------- include/linux/fs.h | 6 ------ 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index ab798a8..e1f209c 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -677,7 +677,7 @@ nlmsvc_update_deferred_block(struct nlm_block *block, struct file_lock *conf, block->b_flags |= B_TIMED_OUT; if (conf) { if (block->b_fl) - __locks_copy_lock(block->b_fl, conf); + locks_copy_lock(block->b_fl, conf); } } diff --git a/fs/locks.c b/fs/locks.c index 717fbc4..5547b3f 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -266,35 +266,20 @@ static void locks_copy_private(struct file_lock *new, struct file_lock *fl) new->fl_lmops = fl->fl_lmops; } -/* - * Initialize a new lock from an existing file_lock structure. - */ -void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl) +void locks_copy_lock(struct file_lock *new, struct file_lock *fl) { + locks_release_private(new); + new->fl_owner = fl->fl_owner; new->fl_pid = fl->fl_pid; - new->fl_file = NULL; + new->fl_file = fl->fl_file; new->fl_flags = fl->fl_flags; new->fl_type = fl->fl_type; new->fl_start = fl->fl_start; new->fl_end = fl->fl_end; - new->fl_ops = NULL; - new->fl_lmops = NULL; -} -EXPORT_SYMBOL(__locks_copy_lock); - -void locks_copy_lock(struct file_lock *new, struct file_lock *fl) -{ - locks_release_private(new); - - __locks_copy_lock(new, fl); - new->fl_file = fl->fl_file; - new->fl_ops = fl->fl_ops; - new->fl_lmops = fl->fl_lmops; locks_copy_private(new, fl); } - EXPORT_SYMBOL(locks_copy_lock); static inline int flock_translate_cmd(int cmd) { @@ -718,7 +703,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl) break; } if (cfl) { - __locks_copy_lock(fl, cfl); + locks_copy_lock(fl, cfl); if (cfl->fl_nspid) fl->fl_pid = pid_vnr(cfl->fl_nspid); } else @@ -921,7 +906,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str if (!posix_locks_conflict(request, fl)) continue; if (conflock) - __locks_copy_lock(conflock, fl); + locks_copy_lock(conflock, fl); error = -EAGAIN; if (!(request->fl_flags & FL_SLEEP)) goto out; diff --git a/include/linux/fs.h b/include/linux/fs.h index 4d40097..0d2c491 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -942,7 +942,6 @@ void locks_free_lock(struct file_lock *fl); extern void locks_init_lock(struct file_lock *); extern struct file_lock * locks_alloc_lock(void); extern void locks_copy_lock(struct file_lock *, struct file_lock *); -extern void __locks_copy_lock(struct file_lock *, const struct file_lock *); extern void locks_remove_posix(struct file *, fl_owner_t); extern void locks_remove_file(struct file *); extern void locks_release_private(struct file_lock *); @@ -1002,11 +1001,6 @@ static inline void locks_init_lock(struct file_lock *fl) return; } -static inline void __locks_copy_lock(struct file_lock *new, struct file_lock *fl) -{ - return; -} - static inline void locks_copy_lock(struct file_lock *new, struct file_lock *fl) { return;