From patchwork Mon Mar 17 11:06:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 3842981 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BEDA29F369 for ; Mon, 17 Mar 2014 11:07:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E61CA2020E for ; Mon, 17 Mar 2014 11:07:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E744E201FE for ; Mon, 17 Mar 2014 11:07:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932506AbaCQLHN (ORCPT ); Mon, 17 Mar 2014 07:07:13 -0400 Received: from mail-qa0-f45.google.com ([209.85.216.45]:33076 "EHLO mail-qa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932549AbaCQLHJ (ORCPT ); Mon, 17 Mar 2014 07:07:09 -0400 Received: by mail-qa0-f45.google.com with SMTP id hw13so5020836qab.4 for ; Mon, 17 Mar 2014 04:07:09 -0700 (PDT) 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=EsPe+AFd7PTTiohqjIUsgvXDvQqaJ9Es2pvsT3Dsy4I=; b=Q1A4ruC5ESAjhFDsJ9QjIKSkr7ppZ5vNOdmbRq7h6U9fG6ErjlxdPxLEk8IbRqWf6X LIJcEzGeNV3zIPxBd5KnqdpNRzATi+lV0mTLAc75acb3Tox6MBDoqt9kzubSyf/vlQed ZFYVBajXjclfvz550rTVBlb3vQHrEV9xdE1CdLwsjigjLwX8z93o55C3VHghz9BzD+5G wazzRr8mktcu+HsGLxILZtLV5cV1xHqNSYtdCLw9b7OnC2gS5ec3HbRZXRsphEaJC7B+ YJCuiCOxNsGFYRPF5kJmyO41fAIEy6yIDvr3MuptmlXgx7ZxggfWj/T9LwhfReK4yc/K Gxxw== X-Gm-Message-State: ALoCoQm6Tw53FiqFCM0sP+uk7X5RqgjH6381xdlxj0Tbctdne7cvsG0UMCEDQzbIykWasKsSAnpW X-Received: by 10.140.87.9 with SMTP id q9mr1251905qgd.94.1395054428980; Mon, 17 Mar 2014 04:07:08 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id x8sm42649351qam.20.2014.03.17.04.07.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 04:07:08 -0700 (PDT) From: Jeff Layton To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 2/5] nfs: make nfs_async_rename non-static Date: Mon, 17 Mar 2014 07:06:55 -0400 Message-Id: <1395054418-14504-3-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1395054418-14504-1-git-send-email-jlayton@redhat.com> References: <1395054418-14504-1-git-send-email-jlayton@redhat.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 ...and move the prototype for nfs_sillyrename to internal.h. Signed-off-by: Jeff Layton --- fs/nfs/internal.h | 7 +++++++ fs/nfs/unlink.c | 2 +- include/linux/nfs_fs.h | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index b46cf5a67329..ae765a56b84f 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -474,6 +474,13 @@ extern int nfs_migrate_page(struct address_space *, #define nfs_migrate_page NULL #endif +/* unlink.c */ +extern struct rpc_task * +nfs_async_rename(struct inode *old_dir, struct inode *new_dir, + struct dentry *old_dentry, struct dentry *new_dentry, + void (*complete)(struct rpc_task *, struct nfs_renamedata *)); +extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry); + /* direct.c */ void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, struct nfs_direct_req *dreq); diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 3e6798c9ba1f..818ded7b7b74 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c @@ -399,7 +399,7 @@ static const struct rpc_call_ops nfs_rename_ops = { * * It's expected that valid references to the dentries and inodes are held */ -static struct rpc_task * +struct rpc_task * nfs_async_rename(struct inode *old_dir, struct inode *new_dir, struct dentry *old_dentry, struct dentry *new_dentry, void (*complete)(struct rpc_task *, struct nfs_renamedata *)) diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 0ae5807480f4..85d31ccc00f8 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -510,7 +510,6 @@ extern void nfs_complete_unlink(struct dentry *dentry, struct inode *); extern void nfs_wait_on_sillyrename(struct dentry *dentry); extern void nfs_block_sillyrename(struct dentry *dentry); extern void nfs_unblock_sillyrename(struct dentry *dentry); -extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry); /* * linux/fs/nfs/write.c