X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flov%2Flov_merge.c;h=20abe46ed77fd118d975a1e0442b4798ed0ea554;hp=984a8ee256d77299ba74348f6ef33720a22b2e29;hb=afef2264887b5223d85d89c57fcd366601f22c39;hpb=45006597080721052cdd858b52054290f9992898 diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c index 984a8ee..20abe46 100644 --- a/lustre/lov/lov_merge.c +++ b/lustre/lov/lov_merge.c @@ -1,25 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * 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 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. * - * 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. + * 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). * - * 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. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #ifndef EXPORT_SYMTAB @@ -38,37 +50,43 @@ #include "lov_internal.h" -/* Merge the lock value block(&lvb) attributes from each of the stripes in a - * file into a single lvb. It is expected that the caller initializes the - * current atime, mtime, ctime to avoid regressing a more uptodate time on - * the local client. - * - * If @kms_only is set then we do not consider the recently seen size (rss) - * when updating the known minimum size (kms). Even when merging RSS, we will - * take the KMS value if it's larger. This prevents getattr from stomping on - * dirty cached pages which extend the file size. */ -int lov_merge_lvb(struct obd_export *exp, struct lov_stripe_md *lsm, - struct ost_lvb *lvb, int kms_only) +/** Merge the lock value block(&lvb) attributes and KMS from each of the + * stripes in a file into a single lvb. It is expected that the caller + * initializes the current atime, mtime, ctime to avoid regressing a more + * uptodate time on the local client. + */ +int lov_merge_lvb_kms(struct lov_stripe_md *lsm, + struct ost_lvb *lvb, __u64 *kms_place) { - struct lov_oinfo *loi; __u64 size = 0; + __u64 kms = 0; __u64 blocks = 0; __u64 current_mtime = lvb->lvb_mtime; __u64 current_atime = lvb->lvb_atime; __u64 current_ctime = lvb->lvb_ctime; int i; + int rc = 0; LASSERT_SPIN_LOCKED(&lsm->lsm_lock); #ifdef __KERNEL__ - LASSERT(lsm->lsm_lock_owner == cfs_current()); + LASSERT(lsm->lsm_lock_owner == cfs_curproc_pid()); #endif for (i = 0; i < lsm->lsm_stripe_count; i++) { + struct lov_oinfo *loi = lsm->lsm_oinfo[i]; obd_size lov_size, tmpsize; - loi = lsm->lsm_oinfo[i]; + if (OST_LVB_IS_ERR(loi->loi_lvb.lvb_blocks)) { + rc = OST_LVB_GET_ERR(loi->loi_lvb.lvb_blocks); + continue; + } + tmpsize = loi->loi_kms; - if (kms_only == 0 && loi->loi_lvb.lvb_size > tmpsize) + lov_size = lov_stripe_size(lsm, tmpsize, i); + if (lov_size > kms) + kms = lov_size; + + if (loi->loi_lvb.lvb_size > tmpsize) tmpsize = loi->loi_lvb.lvb_size; lov_size = lov_stripe_size(lsm, tmpsize, i); @@ -81,7 +99,7 @@ int lov_merge_lvb(struct obd_export *exp, struct lov_stripe_md *lsm, /* mtime is always updated with ctime, but can be set in past. As write and utime(2) may happen within 1 second, and utime's - mtime has a priority over write's one, leave mtime from mds + mtime has a priority over write's one, leave mtime from mds for the same ctimes. */ if (loi->loi_lvb.lvb_ctime > current_ctime) { current_ctime = loi->loi_lvb.lvb_ctime; @@ -89,12 +107,38 @@ int lov_merge_lvb(struct obd_export *exp, struct lov_stripe_md *lsm, } } + *kms_place = kms; lvb->lvb_size = size; lvb->lvb_blocks = blocks; lvb->lvb_mtime = current_mtime; lvb->lvb_atime = current_atime; lvb->lvb_ctime = current_ctime; - RETURN(0); + RETURN(rc); +} + +/** Merge the lock value block(&lvb) attributes from each of the stripes in a + * file into a single lvb. It is expected that the caller initializes the + * current atime, mtime, ctime to avoid regressing a more uptodate time on + * the local client. + * + * If @kms_only is set then we do not consider the recently seen size (rss) + * when updating the known minimum size (kms). Even when merging RSS, we will + * take the KMS value if it's larger. This prevents getattr from stomping on + * dirty cached pages which extend the file size. */ +int lov_merge_lvb(struct obd_export *exp, + struct lov_stripe_md *lsm, struct ost_lvb *lvb, int kms_only) +{ + int rc; + __u64 kms; + + ENTRY; + rc = lov_merge_lvb_kms(lsm, lvb, &kms); + if (kms_only) + lvb->lvb_size = kms; + CDEBUG(D_INODE, "merged: %llu %llu %llu %llu %llu\n", + lvb->lvb_size, lvb->lvb_mtime, lvb->lvb_atime, + lvb->lvb_ctime, lvb->lvb_blocks); + RETURN(rc); } /* Must be called under the lov_stripe_lock() */ @@ -108,20 +152,18 @@ int lov_adjust_kms(struct obd_export *exp, struct lov_stripe_md *lsm, LASSERT_SPIN_LOCKED(&lsm->lsm_lock); #ifdef __KERNEL__ - LASSERT(lsm->lsm_lock_owner == cfs_current()); + LASSERT(lsm->lsm_lock_owner == cfs_curproc_pid()); #endif if (shrink) { - struct lov_oinfo *loi; for (; stripe < lsm->lsm_stripe_count; stripe++) { - loi = lsm->lsm_oinfo[stripe]; + struct lov_oinfo *loi = lsm->lsm_oinfo[stripe]; kms = lov_size_to_stripe(lsm, size, stripe); CDEBUG(D_INODE, "stripe %d KMS %sing "LPU64"->"LPU64"\n", - stripe, kms > loi->loi_kms ? "increas" : - kms < loi->loi_kms ? "shrink" : "leav", + stripe, kms > loi->loi_kms ? "increas":"shrink", loi->loi_kms, kms); - loi->loi_kms = loi->loi_lvb.lvb_size = kms; + loi_kms_set(loi, loi->loi_lvb.lvb_size = kms); } RETURN(0); } @@ -134,7 +176,7 @@ int lov_adjust_kms(struct obd_export *exp, struct lov_stripe_md *lsm, CDEBUG(D_INODE, "stripe %d KMS %sincreasing "LPU64"->"LPU64"\n", stripe, kms > loi->loi_kms ? "" : "not ", loi->loi_kms, kms); if (kms > loi->loi_kms) - loi->loi_kms = kms; + loi_kms_set(loi, kms); RETURN(0); }