From d446b63b67cd886866ccb5620c959190deb8f1d9 Mon Sep 17 00:00:00 2001 From: wangdi Date: Thu, 8 Jun 2006 10:04:29 +0000 Subject: [PATCH] Branch: b_new_cmd separate fld stuff from lustre_fid.h --- lustre/fld/fld_handle.c | 2 +- lustre/fld/fld_iam.c | 2 +- lustre/include/lustre_fid.h | 15 --------------- lustre/include/lustre_fld.h | 41 +++++++++++++++++++++++++++++++++++++++++ lustre/mdt/mdt_internal.h | 1 + 5 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 lustre/include/lustre_fld.h diff --git a/lustre/fld/fld_handle.c b/lustre/fld/fld_handle.c index 73144c6..9c45929 100644 --- a/lustre/fld/fld_handle.c +++ b/lustre/fld/fld_handle.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include "fld_internal.h" static int fld_handle(const struct lu_context *ctx, diff --git a/lustre/fld/fld_iam.c b/lustre/fld/fld_iam.c index b201a5a..554c75b 100644 --- a/lustre/fld/fld_iam.c +++ b/lustre/fld/fld_iam.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include "fld_internal.h" diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h index 2932abe..0376d3a 100644 --- a/lustre/include/lustre_fid.h +++ b/lustre/include/lustre_fid.h @@ -73,20 +73,5 @@ static inline int fid_is_local(struct lu_site *site, const struct lu_fid *fid) void fid_to_le(struct lu_fid *dst, const struct lu_fid *src); -/* - * fld (fid location database) interface. - */ -struct lu_fld { - struct proc_dir_entry *fld_proc_entry; - struct ptlrpc_service *fld_service; - struct dt_device *fld_dt; - struct dt_object *fld_obj; - struct lu_fid fld_fid; /* used during initialization */ - struct dt_index_cookie *fld_cookie; -}; - -int fld_server_init(const struct lu_context *ctx, struct lu_fld *fld, - struct dt_device *dt); -void fld_server_fini(const struct lu_context *ctx, struct lu_fld *fld); #endif /* __LINUX_OBD_CLASS_H */ diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h new file mode 100644 index 0000000..a468a4b --- /dev/null +++ b/lustre/include/lustre_fld.h @@ -0,0 +1,41 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + * + * Copyright (C) 2006 Cluster File Systems, Inc. + * + * This file is part of Lustre, http://www.lustre.org. + * + * Lustre is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * Lustre 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#ifndef __LINUX_FLD_H +#define __LINUX_FLD_H +/* + * fld (fid location database) interface. + */ +struct lu_fld { + struct proc_dir_entry *fld_proc_entry; + struct ptlrpc_service *fld_service; + struct dt_device *fld_dt; + struct dt_object *fld_obj; + struct lu_fid fld_fid; /* used during initialization */ + struct dt_index_cookie *fld_cookie; +}; + +int fld_server_init(const struct lu_context *ctx, struct lu_fld *fld, + struct dt_device *dt); +void fld_server_fini(const struct lu_context *ctx, struct lu_fld *fld); + +#endif diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index e929a14..bbbb734 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -47,6 +47,7 @@ #include #include #include +#include #include struct mdt_device { -- 1.8.3.1