X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flov%2Flov_offset.c;h=3a7f6106796c58fb48ca66213f8c38fc4e606373;hp=4953e8baf05fe78f07322edf3506014fa6323504;hb=f913720c7e09f9e829bbd6bea49e0f4cb9b4e6c5;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;ds=sidebyside diff --git a/lustre/lov/lov_offset.c b/lustre/lov/lov_offset.c index 4953e8b..3a7f610 100644 --- a/lustre/lov/lov_offset.c +++ b/lustre/lov/lov_offset.c @@ -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) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Intel Corporation. + * Copyright (c) 2012, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -36,26 +32,20 @@ #define DEBUG_SUBSYSTEM S_LOV -#ifdef __KERNEL__ #include -#else -#include -#endif #include -#include #include "lov_internal.h" /* compute object size given "stripeno" and the ost size */ -obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size, - int stripeno) +u64 lov_stripe_size(struct lov_stripe_md *lsm, u64 ost_size, int stripeno) { - unsigned long ssize = lsm->lsm_stripe_size; - unsigned long stripe_size; - obd_off swidth; - obd_size lov_size; - int magic = lsm->lsm_magic; + unsigned long ssize = lsm->lsm_stripe_size; + unsigned long stripe_size; + loff_t swidth; + loff_t lov_size; + u32 magic = lsm->lsm_magic; ENTRY; if (ost_size == 0) @@ -74,6 +64,19 @@ obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size, RETURN(lov_size); } +/** + * Compute file level page index by stripe level page offset + */ +pgoff_t lov_stripe_pgoff(struct lov_stripe_md *lsm, pgoff_t stripe_index, + int stripe) +{ + loff_t offset; + + offset = lov_stripe_size(lsm, (stripe_index << PAGE_SHIFT) + 1, + stripe); + return offset >> PAGE_SHIFT; +} + /* we have an offset in file backed by an lov and want to find out where * that offset lands in our given stripe of the file. for the easy * case where the offset is within the stripe, we just have to scale the @@ -122,12 +125,14 @@ obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size, * was moved forward to the start of the stripe in question; 0 when it * 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 *obdoff) +int lov_stripe_offset(struct lov_stripe_md *lsm, loff_t lov_off, int stripeno, + loff_t *obdoff) { - unsigned long ssize = lsm->lsm_stripe_size; - obd_off stripe_off, this_stripe, swidth; - int magic = lsm->lsm_magic; + unsigned long ssize = lsm->lsm_stripe_size; + loff_t stripe_off; + loff_t this_stripe; + loff_t swidth; + u32 magic = lsm->lsm_magic; int ret = 0; if (lov_off == OBD_OBJECT_EOF) { @@ -136,14 +141,13 @@ int lov_stripe_offset(struct lov_stripe_md *lsm, obd_off lov_off, } LASSERT(lsm_op_find(magic) != NULL); - lsm_op_find(magic)->lsm_stripe_by_index(lsm, &stripeno, &lov_off, &swidth); /* 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; + this_stripe = (loff_t)stripeno * ssize; if (stripe_off < this_stripe) { stripe_off = 0; ret = -1; @@ -179,12 +183,14 @@ int lov_stripe_offset(struct lov_stripe_md *lsm, obd_off lov_off, * | 0 | 1 | 2 | 0 | 1 | 2 | * --------------------------------------------------------------------- */ -obd_off lov_size_to_stripe(struct lov_stripe_md *lsm, obd_off file_size, - int stripeno) +loff_t lov_size_to_stripe(struct lov_stripe_md *lsm, u64 file_size, + int stripeno) { - unsigned long ssize = lsm->lsm_stripe_size; - obd_off stripe_off, this_stripe, swidth; - int magic = lsm->lsm_magic; + unsigned long ssize = lsm->lsm_stripe_size; + loff_t stripe_off; + loff_t this_stripe; + loff_t swidth; + u32 magic = lsm->lsm_magic; if (file_size == OBD_OBJECT_EOF) return OBD_OBJECT_EOF; @@ -196,7 +202,7 @@ obd_off lov_size_to_stripe(struct lov_stripe_md *lsm, obd_off file_size, /* lov_do_div64(a, b) returns a % b, and a = a / b */ stripe_off = lov_do_div64(file_size, swidth); - this_stripe = (obd_off)stripeno * ssize; + this_stripe = (loff_t)stripeno * ssize; if (stripe_off < this_stripe) { /* Move to end of previous stripe, or zero */ if (file_size > 0) { @@ -221,16 +227,15 @@ obd_off lov_size_to_stripe(struct lov_stripe_md *lsm, obd_off file_size, * that is contained within the lov extent. this returns true if the given * stripe does intersect with the lov extent. */ int lov_stripe_intersects(struct lov_stripe_md *lsm, int stripeno, - obd_off start, obd_off end, - obd_off *obd_start, obd_off *obd_end) + u64 start, u64 end, u64 *obd_start, u64 *obd_end) { int start_side, end_side; start_side = lov_stripe_offset(lsm, start, stripeno, obd_start); end_side = lov_stripe_offset(lsm, end, stripeno, obd_end); - CDEBUG(D_INODE, "["LPU64"->"LPU64"] -> [(%d) "LPU64"->"LPU64" (%d)]\n", - start, end, start_side, *obd_start, *obd_end, end_side); + CDEBUG(D_INODE, "[%lld->%lld] -> [(%d) %lld->%lld (%d)]\n", + start, end, start_side, *obd_start, *obd_end, end_side); /* this stripe doesn't intersect the file extent when neither * start or the end intersected the stripe and obd_start and @@ -253,11 +258,12 @@ 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) +int lov_stripe_number(struct lov_stripe_md *lsm, loff_t lov_off) { unsigned long ssize = lsm->lsm_stripe_size; - obd_off stripe_off, swidth; - int magic = lsm->lsm_magic; + loff_t stripe_off; + loff_t swidth; + u32 magic = lsm->lsm_magic; LASSERT(lsm_op_find(magic) != NULL); lsm_op_find(magic)->lsm_stripe_by_offset(lsm, NULL, &lov_off, &swidth);