LU-3409 llite: silence lockdep warning in ll_md_blocking_ast

[fs/lustre-release.git] / lustre / lov / lov_offset.c

diff --git a/lustre/lov/lov_offset.c b/lustre/lov/lov_offset.c
index 5e23076..cd13068 100644 (file)
--- a/lustre/lov/lov_offset.c
+++ b/lustre/lov/lov_offset.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,17 +24,16 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * 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__
@@ -57,7 +54,6 @@ obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size,
         unsigned long ssize = lsm->lsm_stripe_size;
         unsigned long stripe_size;
         obd_off swidth;
-        int sindex = stripeno;
         obd_size lov_size;
         int magic = lsm->lsm_magic;
         ENTRY;
@@ -67,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);
 }
 
@@ -131,7 +126,6 @@ int lov_stripe_offset(struct lov_stripe_md *lsm, obd_off lov_off,
                       int stripeno, obd_off *obdoff)
 {
         unsigned long ssize  = lsm->lsm_stripe_size;
-        __u64 l_off, s_off;
         obd_off stripe_off, this_stripe, swidth;
         int magic = lsm->lsm_magic;
         int ret = 0;
@@ -142,28 +136,12 @@ int lov_stripe_offset(struct lov_stripe_md *lsm, obd_off lov_off,
         }
 
         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, obdoff = 0
-         *2) lov_off extent > stripeno extent, ret = 1, 
-         *   obdoff = 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;
-                *obdoff = 0;
-                return ret;
-        } else if (s_off > l_off) {
-                ret = 1;
-                *obdoff = 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);
-       
-        /* ll_do_div64(a, b) returns a % b, and a = a / b */
-        stripe_off = ll_do_div64(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;
         if (stripe_off < this_stripe) {
@@ -215,8 +193,8 @@ 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);
 
-        /* ll_do_div64(a, b) returns a % b, and a = a / b */
-        stripe_off = ll_do_div64(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 = (obd_off)stripeno * ssize;
         if (stripe_off < this_stripe) {
@@ -277,19 +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;
-        obd_off stripe_off, swidth;
-        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 = ll_do_div64(lov_off, swidth);
+       stripe_off = lov_do_div64(lov_off, swidth);
 
-        /* Puts stripe_off/ssize result into stripe_off */
-        do_div(stripe_off, ssize);
+       /* Puts stripe_off/ssize result into stripe_off */
+       lov_do_div64(stripe_off, ssize);
 
-        return (stripe_off +
-                lsm_op_find(magic)->lsm_stripe_index_by_offset(lsm, offset));
+       return stripe_off;
 }