X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_offset.c;h=cd13068b65c3da483515a928b317484317e19927;hb=dd9b9c821c52c6912157a9a6a3f31e354fed9c55;hp=471788239f770ee368e4510832c4fa03b7bfb1b6;hpb=d226b2cad3b49ba6fbc761834f7e081e8163a9f2;p=fs%2Flustre-release.git diff --git a/lustre/lov/lov_offset.c b/lustre/lov/lov_offset.c index 4717882..cd13068 100644 --- a/lustre/lov/lov_offset.c +++ b/lustre/lov/lov_offset.c @@ -1,30 +1,39 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program 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 version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * If you did not agree to a different license, then this copy of Lustre - * is open source 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. + * 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 * - * In either case, 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 - * license text for more details. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_LOV #ifdef __KERNEL__ @@ -42,9 +51,9 @@ obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size, int stripeno) { - unsigned long ssize = lsm->lsm_stripe_size; - unsigned long swidth, stripe_size; - int sindex = stripeno; + unsigned long ssize = lsm->lsm_stripe_size; + unsigned long stripe_size; + obd_off swidth; obd_size lov_size; int magic = lsm->lsm_magic; ENTRY; @@ -54,15 +63,14 @@ obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size, LASSERT(lsm_op_find(magic) != NULL); lsm_op_find(magic)->lsm_stripe_by_index(lsm, &stripeno, NULL, &swidth); - - /* do_div(a, b) returns a % b, and a = a / b */ - stripe_size = do_div(ost_size, ssize); - if (stripe_size) - lov_size = ost_size * swidth + stripeno * ssize + stripe_size; - else - lov_size = (ost_size - 1) * swidth + (stripeno + 1) * ssize; - - lov_size += lsm_op_find(magic)->lsm_stripe_offset_by_index(lsm, sindex); + + /* lov_do_div64(a, b) returns a % b, and a = a / b */ + stripe_size = lov_do_div64(ost_size, ssize); + if (stripe_size) + lov_size = ost_size * swidth + stripeno * ssize + stripe_size; + else + lov_size = (ost_size - 1) * swidth + (stripeno + 1) * ssize; + RETURN(lov_size); } @@ -115,44 +123,27 @@ obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size, * falls in the stripe and no shifting was done; > 0 when the offset * was outside the stripe and was pulled back to its final byte. */ int lov_stripe_offset(struct lov_stripe_md *lsm, obd_off lov_off, - int stripeno, obd_off *obd_off) + int stripeno, obd_off *obdoff) { unsigned long ssize = lsm->lsm_stripe_size; - unsigned long swidth, stripe_off, this_stripe; - __u64 l_off, s_off; + obd_off stripe_off, this_stripe, swidth; int magic = lsm->lsm_magic; int ret = 0; if (lov_off == OBD_OBJECT_EOF) { - *obd_off = OBD_OBJECT_EOF; + *obdoff = OBD_OBJECT_EOF; return 0; } LASSERT(lsm_op_find(magic) != NULL); - /*It will check whether the lov_off and stripeno - *are in the same extent. - *1) lov_off extent < stripeno extent, ret = -1, obd_off = 0 - *2) lov_off extent > stripeno extent, ret = 1, - * obd_off = lov_off extent offset*/ - l_off = lsm_op_find(magic)->lsm_stripe_offset_by_index(lsm, stripeno); - s_off = lsm_op_find(magic)->lsm_stripe_offset_by_offset(lsm, lov_off); - if (s_off < l_off) { - ret = -1; - *obd_off = 0; - return ret; - } else if (s_off > l_off) { - ret = 1; - *obd_off = s_off; - return ret; - } - /*If they are in the same extent, original logic*/ + lsm_op_find(magic)->lsm_stripe_by_index(lsm, &stripeno, &lov_off, &swidth); - - /* do_div(a, b) returns a % b, and a = a / b */ - stripe_off = do_div(lov_off, swidth); - this_stripe = stripeno * ssize; + /* lov_do_div64(a, b) returns a % b, and a = a / b */ + stripe_off = lov_do_div64(lov_off, swidth); + + this_stripe = (obd_off)stripeno * ssize; if (stripe_off < this_stripe) { stripe_off = 0; ret = -1; @@ -165,7 +156,7 @@ int lov_stripe_offset(struct lov_stripe_md *lsm, obd_off lov_off, } } - *obd_off = lov_off * ssize + stripe_off; + *obdoff = lov_off * ssize + stripe_off; return ret; } @@ -192,7 +183,7 @@ obd_off lov_size_to_stripe(struct lov_stripe_md *lsm, obd_off file_size, int stripeno) { unsigned long ssize = lsm->lsm_stripe_size; - unsigned long swidth, stripe_off, this_stripe; + obd_off stripe_off, this_stripe, swidth; int magic = lsm->lsm_magic; if (file_size == OBD_OBJECT_EOF) @@ -202,10 +193,10 @@ obd_off lov_size_to_stripe(struct lov_stripe_md *lsm, obd_off file_size, lsm_op_find(magic)->lsm_stripe_by_index(lsm, &stripeno, &file_size, &swidth); - /* do_div(a, b) returns a % b, and a = a / b */ - stripe_off = do_div(file_size, swidth); + /* lov_do_div64(a, b) returns a % b, and a = a / b */ + stripe_off = lov_do_div64(file_size, swidth); - this_stripe = stripeno * ssize; + this_stripe = (obd_off)stripeno * ssize; if (stripe_off < this_stripe) { /* Move to end of previous stripe, or zero */ if (file_size > 0) { @@ -264,16 +255,17 @@ int lov_stripe_intersects(struct lov_stripe_md *lsm, int stripeno, /* compute which stripe number "lov_off" will be written into */ int lov_stripe_number(struct lov_stripe_md *lsm, obd_off lov_off) { - unsigned long ssize = lsm->lsm_stripe_size; - unsigned long swidth, stripe_off; - obd_off offset = lov_off; - int magic = lsm->lsm_magic; + unsigned long ssize = lsm->lsm_stripe_size; + obd_off stripe_off, swidth; + int magic = lsm->lsm_magic; - LASSERT(lsm_op_find(magic) != NULL); - lsm_op_find(magic)->lsm_stripe_by_offset(lsm, NULL, &lov_off, &swidth); + LASSERT(lsm_op_find(magic) != NULL); + lsm_op_find(magic)->lsm_stripe_by_offset(lsm, NULL, &lov_off, &swidth); + + stripe_off = lov_do_div64(lov_off, swidth); - stripe_off = do_div(lov_off, swidth); + /* Puts stripe_off/ssize result into stripe_off */ + lov_do_div64(stripe_off, ssize); - return (stripe_off/ssize + - lsm_op_find(magic)->lsm_stripe_index_by_offset(lsm, offset)); + return stripe_off; }