From patchwork Mon Aug 29 18:49:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 1110322 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7TIurFH016126 for ; Mon, 29 Aug 2011 18:57:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754793Ab1H2S4w (ORCPT ); Mon, 29 Aug 2011 14:56:52 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:53661 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753945Ab1H2S4v (ORCPT ); Mon, 29 Aug 2011 14:56:51 -0400 Received: by iabu26 with SMTP id u26so737334iab.19 for ; Mon, 29 Aug 2011 11:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=KsHZTirXRKBSaU1JGJmDDeXlg88aCTZsWPNqwVZRwDs=; b=yG0tFMhpMt+6TMylrDZep4puUKxJtpPLFb4/ufZXXV10XYMl3elGmfuyAt4PEyyhgd 98rLiWVSMwO73034tlQrcJUUH0KdfIr1912NZ7eW0Vlt7ZMpmFd6QE+9yPsz7IubJgEg YtXsbTPPqRWZ8nWr85LnwSBDNTV1jpxHLHNdU= Received: by 10.231.6.99 with SMTP id 35mr11147367iby.7.1314643743268; Mon, 29 Aug 2011 11:49:03 -0700 (PDT) Received: from matisse.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id b9sm2737286ibb.32.2011.08.29.11.49.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Aug 2011 11:49:02 -0700 (PDT) From: Chuck Lever Subject: [PATCH 2/3] NFSD: Remove the ex_pathname field from struct svc_export To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org Date: Mon, 29 Aug 2011 14:49:00 -0400 Message-ID: <20110829184900.3305.13531.stgit@matisse.1015granger.net> In-Reply-To: <20110829184608.3305.93648.stgit@matisse.1015granger.net> References: <20110829184608.3305.93648.stgit@matisse.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 29 Aug 2011 18:57:40 +0000 (UTC) From: Trond Myklebust There are no more users... Signed-off-by: Trond Myklebust --- fs/nfsd/export.c | 11 ----------- include/linux/nfsd/export.h | 1 - 2 files changed, 0 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index d9a6611..bf985f7 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -318,7 +318,6 @@ static void svc_export_put(struct kref *ref) struct svc_export *exp = container_of(ref, struct svc_export, h.ref); path_put(&exp->ex_path); auth_domain_put(exp->ex_client); - kfree(exp->ex_pathname); nfsd4_fslocs_free(&exp->ex_fslocs); kfree(exp); } @@ -528,11 +527,6 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) exp.ex_client = dom; - err = -ENOMEM; - exp.ex_pathname = kstrdup(buf, GFP_KERNEL); - if (!exp.ex_pathname) - goto out2; - /* expiry */ err = -EINVAL; exp.h.expiry_time = get_expiry(&mesg); @@ -613,8 +607,6 @@ out4: nfsd4_fslocs_free(&exp.ex_fslocs); kfree(exp.ex_uuid); out3: - kfree(exp.ex_pathname); -out2: path_put(&exp.ex_path); out1: auth_domain_put(dom); @@ -678,7 +670,6 @@ static void svc_export_init(struct cache_head *cnew, struct cache_head *citem) new->ex_client = item->ex_client; new->ex_path.dentry = dget(item->ex_path.dentry); new->ex_path.mnt = mntget(item->ex_path.mnt); - new->ex_pathname = NULL; new->ex_fslocs.locations = NULL; new->ex_fslocs.locations_count = 0; new->ex_fslocs.migrated = 0; @@ -696,8 +687,6 @@ static void export_update(struct cache_head *cnew, struct cache_head *citem) new->ex_fsid = item->ex_fsid; new->ex_uuid = item->ex_uuid; item->ex_uuid = NULL; - new->ex_pathname = item->ex_pathname; - item->ex_pathname = NULL; new->ex_fslocs.locations = item->ex_fslocs.locations; item->ex_fslocs.locations = NULL; new->ex_fslocs.locations_count = item->ex_fslocs.locations_count; diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index 7ba3fd4..f85308e 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h @@ -96,7 +96,6 @@ struct svc_export { struct auth_domain * ex_client; int ex_flags; struct path ex_path; - char *ex_pathname; uid_t ex_anon_uid; gid_t ex_anon_gid; int ex_fsid;