X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_fld.h;h=102dcfac774806c623b3682beaca767667f0db61;hb=6d2b66d22c25a488aa02f3a3a41888d99322f448;hp=f02639ba299fc5b94725e291e7bae93f35ca10f3;hpb=4f53536d002c13886210b672b657795baa067144;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h index f02639b..102dcfa 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, 2014, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,8 +38,9 @@ * @{ */ -#include +#include #include +#include struct lu_env; struct lu_client_fld; @@ -70,9 +67,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 */ @@ -111,8 +109,9 @@ struct lu_server_fld { 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. */ @@ -135,10 +134,9 @@ struct lu_client_fld { struct fld_cache *lcf_cache; /** - * Client fld proc entry name. */ + * Client fld debugfs entry name. + */ char lcf_name[80]; - - int lcf_flags; }; /* Server methods */ @@ -194,7 +192,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 */