X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdfilter%2Ffilter_lvb.c;h=43c69b1eec3f150bcf75188511a0aeaa72ebb21e;hb=1ed3d8a1fffdcf3304a9826729bb571b63ad5778;hp=aa9a88b8b95f8d6bdec3fdb07ab23bbb1318058a;hpb=191061ee668400324f4505cf498f1ee2d57e4962;p=fs%2Flustre-release.git diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c index aa9a88b..43c69b1 100644 --- a/lustre/obdfilter/filter_lvb.c +++ b/lustre/obdfilter/filter_lvb.c @@ -8,46 +8,50 @@ * Author: Andreas Dilger * Author: Phil Schwan * - * This file is part of Lustre, http://www.lustre.org. + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free 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 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. * - * 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 - * GNU General Public License for more details. + * 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 - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ #define DEBUG_SUBSYSTEM S_FILTER +#ifndef AUTOCONF_INCLUDED #include +#endif #include #include -#include -#include -#include +#include +#include +#include #include "filter_internal.h" /* Called with res->lr_lvb_sem held */ static int filter_lvbo_init(struct ldlm_resource *res) { - int rc = 0; - struct obdo *oa = NULL; struct ost_lvb *lvb = NULL; struct obd_device *obd; struct dentry *dentry; + int rc = 0; ENTRY; LASSERT(res); - LASSERT(down_trylock(&res->lr_lvb_sem) != 0); + LASSERT_SEM_LOCKED(&res->lr_lvb_sem); /* we only want lvb's for object resources */ /* check for internal locks: these have name[1] != 0 */ @@ -55,11 +59,11 @@ static int filter_lvbo_init(struct ldlm_resource *res) RETURN(0); if (res->lr_lvb_data) - GOTO(out, rc = 0); + RETURN(0); OBD_ALLOC(lvb, sizeof(*lvb)); if (lvb == NULL) - GOTO(out, rc = -ENOMEM); + RETURN(-ENOMEM); res->lr_lvb_data = lvb; res->lr_lvb_len = sizeof(*lvb); @@ -67,35 +71,30 @@ static int filter_lvbo_init(struct ldlm_resource *res) obd = res->lr_namespace->ns_lvbp; LASSERT(obd != NULL); - oa = obdo_alloc(); - if (oa == NULL) - GOTO(out, rc = -ENOMEM); - - oa->o_id = res->lr_name.name[0]; - oa->o_gr = res->lr_name.name[2]; - oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP; - - dentry = filter_oa2dentry(obd, oa); - if (IS_ERR(dentry)) - GOTO(out, rc = PTR_ERR(dentry)); + dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[2], + res->lr_name.name[0]); + if (IS_ERR(dentry)) { + rc = PTR_ERR(dentry); + CERROR("%s: bad object "LPU64"/"LPU64": rc %d\n", obd->obd_name, + res->lr_name.name[0], res->lr_name.name[1], rc); + RETURN(rc); + } - /* Limit the valid bits in the return data to what we actually use */ - oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP; - obdo_from_inode(oa, dentry->d_inode, FILTER_VALID_FLAGS); - f_dput(dentry); + if (dentry->d_inode == NULL) + /* This is always true for test_brw */ + GOTO(out_dentry, rc = -ENOENT); - lvb->lvb_size = dentry->d_inode->i_size; - lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime); - lvb->lvb_blocks = dentry->d_inode->i_blocks; + inode_init_lvb(dentry->d_inode, lvb); CDEBUG(D_DLMTRACE, "res: "LPU64" initial lvb size: "LPU64", " "mtime: "LPU64", blocks: "LPU64"\n", res->lr_name.name[0], lvb->lvb_size, lvb->lvb_mtime, lvb->lvb_blocks); - out: - if (oa) - obdo_free(oa); + EXIT; +out_dentry: + f_dput(dentry); + /* Don't free lvb data on lookup error */ return rc; } @@ -105,14 +104,13 @@ static int filter_lvbo_init(struct ldlm_resource *res) * m != NULL : called by the DLM itself after a glimpse callback * m == NULL : called by the filter after a disk write * - * If 'increase' is true, don't allow values to move backwards. + * If 'increase_only' is true, don't allow values to move backwards. */ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, - int buf_idx, int increase) + int buf_idx, int increase_only) { int rc = 0; - struct obdo *oa = NULL; - struct ost_lvb *lvb = res->lr_lvb_data; + struct ost_lvb *lvb; struct obd_device *obd; struct dentry *dentry; ENTRY; @@ -125,7 +123,8 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, RETURN(0); down(&res->lr_lvb_sem); - if (!res->lr_lvb_data) { + lvb = res->lr_lvb_data; + if (lvb == NULL) { CERROR("No lvb when running lvbo_update!\n"); GOTO(out, rc = 0); } @@ -138,71 +137,83 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m, lustre_swab_ost_lvb); if (new == NULL) { CERROR("lustre_swab_buf failed\n"); - //GOTO(out, rc = -EPROTO); - GOTO(out, rc = 0); + goto disk_update; } - if (new->lvb_size > lvb->lvb_size || !increase) { + if (new->lvb_size > lvb->lvb_size || !increase_only) { CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb size: " LPU64" -> "LPU64"\n", res->lr_name.name[0], lvb->lvb_size, new->lvb_size); lvb->lvb_size = new->lvb_size; } - if (new->lvb_mtime > lvb->lvb_mtime || !increase) { + if (new->lvb_mtime > lvb->lvb_mtime || !increase_only) { CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb mtime: " LPU64" -> "LPU64"\n", res->lr_name.name[0], lvb->lvb_mtime, new->lvb_mtime); lvb->lvb_mtime = new->lvb_mtime; } - if (new->lvb_blocks > lvb->lvb_blocks || !increase) { - CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb blocks: " + if (new->lvb_atime > lvb->lvb_atime || !increase_only) { + CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb atime: " LPU64" -> "LPU64"\n", res->lr_name.name[0], - lvb->lvb_blocks, new->lvb_blocks); - lvb->lvb_blocks = new->lvb_blocks; + lvb->lvb_atime, new->lvb_atime); + lvb->lvb_atime = new->lvb_atime; + } + if (new->lvb_ctime > lvb->lvb_ctime || !increase_only) { + CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb ctime: " + LPU64" -> "LPU64"\n", res->lr_name.name[0], + lvb->lvb_ctime, new->lvb_ctime); + lvb->lvb_ctime = new->lvb_ctime; } - GOTO(out, rc = 0); } + disk_update: /* Update the LVB from the disk inode */ obd = res->lr_namespace->ns_lvbp; LASSERT(obd); - - oa = obdo_alloc(); - if (oa == NULL) - GOTO(out, rc = -ENOMEM); - - oa->o_id = res->lr_name.name[0]; - oa->o_gr = res->lr_name.name[2]; - oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP; - dentry = filter_oa2dentry(obd, oa); + + dentry = filter_fid2dentry(obd, NULL, res->lr_name.name[2], + res->lr_name.name[0]); if (IS_ERR(dentry)) GOTO(out, rc = PTR_ERR(dentry)); - /* Limit the valid bits in the return data to what we actually use */ - oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP; - obdo_from_inode(oa, dentry->d_inode, FILTER_VALID_FLAGS); + if (dentry->d_inode == NULL) + GOTO(out_dentry, rc = -ENOENT); - if (dentry->d_inode->i_size > lvb->lvb_size || !increase) { + if (i_size_read(dentry->d_inode) > lvb->lvb_size || !increase_only) { CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb size from disk: " LPU64" -> %llu\n", res->lr_name.name[0], - lvb->lvb_size, dentry->d_inode->i_size); - lvb->lvb_size = dentry->d_inode->i_size; + lvb->lvb_size, i_size_read(dentry->d_inode)); + lvb->lvb_size = i_size_read(dentry->d_inode); } - if (LTIME_S(dentry->d_inode->i_mtime) > lvb->lvb_mtime || !increase) { + if (LTIME_S(dentry->d_inode->i_mtime) >lvb->lvb_mtime|| !increase_only){ CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb mtime from disk: " LPU64" -> %lu\n", res->lr_name.name[0], lvb->lvb_mtime, LTIME_S(dentry->d_inode->i_mtime)); lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime); } - CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb blocks from disk: " - LPU64" -> %lu\n", res->lr_name.name[0], - lvb->lvb_blocks, dentry->d_inode->i_blocks); - lvb->lvb_blocks = dentry->d_inode->i_blocks; + if (LTIME_S(dentry->d_inode->i_atime) >lvb->lvb_atime|| !increase_only){ + CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb atime from disk: " + LPU64" -> %lu\n", res->lr_name.name[0], + lvb->lvb_atime, LTIME_S(dentry->d_inode->i_atime)); + lvb->lvb_atime = LTIME_S(dentry->d_inode->i_atime); + } + if (LTIME_S(dentry->d_inode->i_ctime) >lvb->lvb_ctime|| !increase_only){ + CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb ctime from disk: " + LPU64" -> %lu\n", res->lr_name.name[0], + lvb->lvb_ctime, LTIME_S(dentry->d_inode->i_ctime)); + lvb->lvb_ctime = LTIME_S(dentry->d_inode->i_ctime); + } + if (lvb->lvb_blocks != dentry->d_inode->i_blocks) { + CDEBUG(D_DLMTRACE,"res: "LPU64" updating lvb blocks from disk: " + LPU64" -> %lu\n", res->lr_name.name[0], + lvb->lvb_blocks, dentry->d_inode->i_blocks); + lvb->lvb_blocks = dentry->d_inode->i_blocks; + } +out_dentry: f_dput(dentry); + out: - if (oa) - obdo_free(oa); up(&res->lr_lvb_sem); return rc; }