X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_lov.h;h=b4de8d28373533a868057347f397f0eb34311713;hb=4c1c3b4d33c85216b8d50264b8ba8101173e2698;hp=9983197d960bb907b2179f3da57750e4cbd67939;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/lustre/include/obd_lov.h b/lustre/include/obd_lov.h index 9983197..b4de8d2 100644 --- a/lustre/include/obd_lov.h +++ b/lustre/include/obd_lov.h @@ -16,8 +16,8 @@ * 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 [sun.com URL with a - * copy of GPLv2]. + * 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 @@ -42,11 +42,14 @@ static inline int lov_stripe_md_size(int stripes) return sizeof(struct lov_stripe_md) + stripes*sizeof(struct lov_oinfo*); } -#define lov_mds_md_size(stripes) lov_mds_md_v1_size(stripes) -static inline int lov_mds_md_v1_size(int stripes) +static inline int lov_mds_md_size(int stripes, int lmm_magic) { - return sizeof(struct lov_mds_md_v1) + - stripes * sizeof(struct lov_ost_data_v1); + if (lmm_magic == LOV_MAGIC_V3) + return sizeof(struct lov_mds_md_v3) + + stripes * sizeof(struct lov_ost_data_v1); + else + return sizeof(struct lov_mds_md_v1) + + stripes * sizeof(struct lov_ost_data_v1); } #define IOC_LOV_TYPE 'g'