From patchwork Thu Jan 8 18:34:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 5595041 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 73551C058D for ; Thu, 8 Jan 2015 18:36:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AAA0D20443 for ; Thu, 8 Jan 2015 18:36:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23A9C2044B for ; Thu, 8 Jan 2015 18:36:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754895AbbAHSgd (ORCPT ); Thu, 8 Jan 2015 13:36:33 -0500 Received: from mail-qc0-f174.google.com ([209.85.216.174]:53312 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932478AbbAHSe6 (ORCPT ); Thu, 8 Jan 2015 13:34:58 -0500 Received: by mail-qc0-f174.google.com with SMTP id c9so3710604qcz.5 for ; Thu, 08 Jan 2015 10:34:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=nLsay/dO181eEMgkWFFfxrDd3+swRuAizguyfFlLEm8=; b=PZtpRT1uLozwmO/AqT1j3nCBkuo15Bz1sPEqUZDEaJdT94baxLZEDD2efp+2QrOHdv +Go8RWqqX5fNaVa8h7CplNpvbf2Va2fPkjfd9c8RAlLKa0iRnyAPAtoBuE23ryza3q/E sSufdW7Vt9WlGDkWMUlUc270IcLO3qqUDpZh40/2FYDve0r0T/h0Ey0fXACyDsX36tod 4ibK4DX6exWFLFYUop376d0Ph81Eg0znq8PHJCwJ3JnqZPf6B6T6vQQGzp2XukeQnOMJ 8j2DmAGc/WRGFFUDAtt99Dr0pb2iiqgKotCEzF6qI8uC+rRgVuIeePdTqVcnKiO2JCTi 0jfQ== X-Gm-Message-State: ALoCoQkDE7Yw6jKMUzXXBkPYpgCD3e/Gx/VECtQMuyGiQgJQo5ggciU7G3CYCyXJxnySEi3IS5Lt X-Received: by 10.140.44.134 with SMTP id g6mr17161359qga.85.1420742098267; Thu, 08 Jan 2015 10:34:58 -0800 (PST) Received: from synchrony.poochiereds.net ([50.242.95.105]) by mx.google.com with ESMTPSA id 7sm4708739qak.20.2015.01.08.10.34.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jan 2015 10:34:57 -0800 (PST) From: Jeff Layton To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, hch@infradead.org Subject: [PATCH v2 07/10] locks: remove i_flock field from struct inode Date: Thu, 8 Jan 2015 10:34:22 -0800 Message-Id: <1420742065-28423-8-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1420742065-28423-1-git-send-email-jlayton@primarydata.com> References: <1420742065-28423-1-git-send-email-jlayton@primarydata.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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Nothing uses it anymore. Also add a forward declaration for struct file_lock to silence some compiler warnings that the removal triggers. Signed-off-by: Jeff Layton --- include/linux/fs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 380717828ba1..7da02cb90b30 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -625,7 +625,6 @@ struct inode { atomic_t i_readcount; /* struct files open RO */ #endif const struct file_operations *i_fop; /* former ->i_op->default_file_ops */ - struct file_lock *i_flock; struct file_lock_context *i_flctx; struct address_space i_data; struct list_head i_devices; @@ -886,6 +885,8 @@ static inline struct file *get_file(struct file *f) /* legacy typedef, should eventually be removed */ typedef void *fl_owner_t; +struct file_lock; + struct file_lock_operations { void (*fl_copy_lock)(struct file_lock *, struct file_lock *); void (*fl_release_private)(struct file_lock *);