X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_target.h;h=79f29dd374d868ea38c3215438b81ccbf49fc100;hb=d6ce546eb7e250237141d3a11380f9d5389c50eb;hp=14498ff4e3214962ae2d2c5aaff7f1d3d96e4a1a;hpb=3f80e23eaf9dead631585c3b689549c723c164df;p=fs%2Flustre-release.git diff --git a/lustre/include/obd_target.h b/lustre/include/obd_target.h index 14498ff..79f29dd 100644 --- a/lustre/include/obd_target.h +++ b/lustre/include/obd_target.h @@ -14,11 +14,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 */ @@ -26,7 +22,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Intel, Inc. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -46,6 +42,7 @@ struct obd_device_target { struct lu_target *obt_lut; __u64 obt_mount_count; struct obd_job_stats obt_jobstats; + struct nm_config_file *obt_nodemap_config_file; }; #define OBJ_SUBDIR_COUNT 32 /* set to zero for no subdirs */ @@ -53,11 +50,6 @@ struct obd_device_target { struct filter_obd { /* NB this field MUST be first */ struct obd_device_target fo_obt; - - /* capability related */ - unsigned int fo_fl_oss_capa; - struct list_head fo_capa_keys; - struct hlist_head *fo_capa_hash; }; struct echo_obd {