From 84bc9f804685a38330a9ed92764e8599c274e6da Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Mon, 28 Jan 2013 09:23:51 -0800 Subject: [PATCH] LU-2158 fsfilt: Remove lvfs_common.c This change removes the lvfs_common.c file, and moves it's only remaining functionality directly into the obd_lfs_fid2dentry function. This should have no functional impact, and is merely a code cleanup exercise. Signed-off-by: Prakash Surya Change-Id: I5f8588a17f6e7659a7d33c2a5f79792826976de4 Reviewed-on: http://review.whamcloud.com/5193 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Reviewed-by: Oleg Drokin --- lustre/include/obd_class.h | 6 +++--- lustre/lvfs/Makefile.in | 2 +- lustre/lvfs/lvfs_common.c | 44 -------------------------------------------- 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 lustre/lvfs/lvfs_common.c diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h index e754106..944c602 100644 --- a/lustre/include/obd_class.h +++ b/lustre/include/obd_class.h @@ -1197,10 +1197,10 @@ static inline int obd_extent_calc(struct obd_export *exp, static inline struct dentry * obd_lvfs_fid2dentry(struct obd_export *exp, __u64 id_ino, __u32 gen, __u64 gr) { - LASSERT(exp->exp_obd); + struct lvfs_run_ctxt *ctxt = &exp->exp_obd->obd_lvfs_ctxt; + LASSERT(exp->exp_obd); - return lvfs_fid2dentry(&exp->exp_obd->obd_lvfs_ctxt, id_ino, gen, gr, - exp->exp_obd); + return ctxt->cb_ops.l_fid2dentry(id_ino, gen, gr, exp->exp_obd); } static inline int diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in index 2e62ded..3d21989 100644 --- a/lustre/lvfs/Makefile.in +++ b/lustre/lvfs/Makefile.in @@ -1,7 +1,7 @@ MODULES := lvfs @LDISKFS_ENABLED_TRUE@MODULES += fsfilt_ldiskfs -lvfs-objs := lvfs_common.o lvfs_linux.o fsfilt.o lvfs_lib.o +lvfs-objs := lvfs_linux.o fsfilt.o lvfs_lib.o @LDISKFS_ENABLED_TRUE@fsfilt_ldiskfs-objs := fsfilt-ldiskfs.o diff --git a/lustre/lvfs/lvfs_common.c b/lustre/lvfs/lvfs_common.c deleted file mode 100644 index a1f6b26..0000000 --- a/lustre/lvfs/lvfs_common.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#define DEBUG_SUBSYSTEM S_FILTER - -#include - -struct dentry *lvfs_fid2dentry(struct lvfs_run_ctxt *ctxt, __u64 id, - __u32 gen, __u64 gr, void *data) -{ - return ctxt->cb_ops.l_fid2dentry(id, gen, gr, data); -} -EXPORT_SYMBOL(lvfs_fid2dentry); -- 1.8.3.1