X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_fld.h;h=3d8288b7da89ab5984f4fe264814f1c1fbf7cc69;hb=refs%2Fchanges%2F38%2F37738%2F5;hp=edd54f90549d9bf7a4576d2e1b5f3054fee61e34;hpb=736ffdc4d6975aaeac83019dd2a88100f4e3d028;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h index edd54f9..3d8288b 100644 --- a/lustre/include/lustre_fld.h +++ b/lustre/include/lustre_fld.h @@ -15,11 +15,7 @@ * * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,8 +38,10 @@ * @{ */ -#include +#include #include +#include +#include struct lu_env; struct lu_client_fld; @@ -70,9 +68,10 @@ struct lu_fld_target { }; struct lu_server_fld { - /** - * Fld dir proc entry. */ - struct proc_dir_entry *lsf_proc_dir; + /** + * Fld dir debugfs entry. + */ + struct dentry *lsf_debugfs_entry; /** * /fld file object device */ @@ -91,23 +90,30 @@ struct lu_server_fld { * Protect index modifications */ struct mutex lsf_lock; - /** - * Fld service name in form "fld-srv-lustre-MDTXXX" */ - char lsf_name[80]; + /** + * Fld service name in form "fld-srv-lustre-MDTXXX" + */ + char lsf_name[LUSTRE_MDT_MAXNAMELEN]; + + int (*lsf_seq_lookup)(const struct lu_env *env, + struct lu_server_fld *fld, u64 seq, + struct lu_seq_range *range); /** - * Just reformated or upgraded, and this flag is being + * Just reformatted or upgraded, and this flag is being * used to check whether the local FLDB is needs to be * synced with global FLDB(in MDT0), and it is only needed * if the MDT is upgraded from < 2.6 to 2.6, i.e. when the * local FLDB is being invited */ unsigned int lsf_new:1; + }; struct lu_client_fld { /** - * Client side proc entry. */ - struct proc_dir_entry *lcf_proc_dir; + * Client side debugfs entry. + */ + struct dentry *lcf_debugfs_entry; /** * List of exports client FLD knows about. */ @@ -129,11 +135,10 @@ struct lu_client_fld { * Client FLD cache. */ struct fld_cache *lcf_cache; - /** - * Client fld proc entry name. */ - char lcf_name[80]; - - int lcf_flags; + /** + * Client fld debugfs entry name. + */ + char lcf_name[LUSTRE_MDT_MAXNAMELEN]; }; /* Server methods */ @@ -189,7 +194,7 @@ int fld_client_add_target(struct lu_client_fld *fld, int fld_client_del_target(struct lu_client_fld *fld, __u64 idx); -void fld_client_proc_fini(struct lu_client_fld *fld); +void fld_client_debugfs_fini(struct lu_client_fld *fld); /** @} fld */