fed->fed_grant -= oa->o_dropped;
fed->fed_dirty = oa->o_dirty;
- if (oa->o_flags & OBD_FL_SHRINK_GRANT) {
+ if (oa->o_valid & OBD_MD_FLFLAGS && oa->o_flags & OBD_FL_SHRINK_GRANT) {
obd_size left_space = filter_grant_space_left(exp);
struct filter_obd *filter = &exp->exp_obd->u.filter;
LASSERT_SPIN_LOCKED(&obd->obd_osfs_lock);
if (cfs_time_before_64(obd->obd_osfs_age,
- cfs_time_current_64() - CFS_HZ)) {
+ cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS))) {
restat:
rc = fsfilt_statfs(obd, obd->u.obt.obt_sb,
- cfs_time_current_64() + CFS_HZ);
+ cfs_time_shift_64(OBD_STATFS_CACHE_SECONDS));
if (rc) /* N.B. statfs can't really fail */
RETURN(0);
statfs_done = 1;
* as we might end up waiting on a page he sent in the request we're serving.
* use __GFP_HIGHMEM so that the pages can use all of the available memory
* on 32-bit machines
- * use more agressive GFP_HIGHUSER flags from non-local clients to be able to
- * generate more memory pressure, but at the same time use __GFP_NOMEMALLOC
- * in order not to exhaust emergency reserves.
+ * use more aggressive GFP_HIGHUSER flags from non-local clients to be able to
+ * generate more memory pressure.
*
* See Bug 19529 and Bug 19917 for details.
*/
cfs_spin_lock(&obd->obd_osfs_lock);
filter_grant_incoming(exp, oa);
- if (!(oa->o_flags & OBD_FL_SHRINK_GRANT))
+ if (!(oa->o_valid & OBD_MD_FLFLAGS) ||
+ !(oa->o_flags & OBD_FL_SHRINK_GRANT))
oa->o_grant = 0;
cfs_spin_unlock(&obd->obd_osfs_lock);
}
int blocksize = exp->exp_obd->u.obt.obt_sb->s_blocksize;
unsigned long used = 0, ungranted = 0, using;
int i, rc = -ENOSPC, obj, n = 0;
- int resend = oa->o_valid & OBD_FL_RECOV_RESEND;
+ int resend = 0;
- LASSERT_SPIN_LOCKED(&exp->exp_obd->obd_osfs_lock);
-
- if (resend)
+ if ((oa->o_valid & OBD_MD_FLFLAGS) &&
+ (oa->o_flags & OBD_FL_RECOV_RESEND)) {
+ resend = 1;
CDEBUG(D_CACHE, "Recoverable resend arrived, skipping "
"accounting\n");
+ }
+
+ LASSERT_SPIN_LOCKED(&exp->exp_obd->obd_osfs_lock);
for (obj = 0; obj < objcount; obj++) {
for (i = 0; i < fso[obj].fso_bufcnt; i++, n++) {
if ((lnb[n].flags & OBD_BRW_FROM_GRANT) &&
(oa->o_valid & OBD_MD_FLGRANT)) {
if (resend) {
+ /* this is a recoverable resent */
lnb[n].flags |= OBD_BRW_GRANTED;
rc = 0;
continue;
cleanup_phase = 2;
if (dentry->d_inode == NULL) {
- CERROR("%s: trying to BRW to non-existent file "LPU64"\n",
- obd->obd_name, obj->ioo_id);
- GOTO(cleanup, rc = -ENOENT);
+ if (exp->exp_obd->obd_recovering) {
+ struct obdo *noa = oa;
+
+ if (oa == NULL) {
+ OBDO_ALLOC(noa);
+ if (noa == NULL)
+ GOTO(recreate_out, rc = -ENOMEM);
+ noa->o_id = obj->ioo_id;
+ noa->o_valid = OBD_MD_FLID;
+ }
+
+ if (filter_create(exp, noa, NULL, oti) == 0) {
+ f_dput(dentry);
+ dentry = filter_fid2dentry(exp->exp_obd, NULL,
+ obj->ioo_seq,
+ obj->ioo_id);
+ }
+ if (oa == NULL)
+ OBDO_FREE(noa);
+ }
+ recreate_out:
+ if (IS_ERR(dentry) || dentry->d_inode == NULL) {
+ CERROR("%s: BRW to missing obj "LPU64"/"LPU64":rc %d\n",
+ exp->exp_obd->obd_name,
+ obj->ioo_id, obj->ioo_seq,
+ IS_ERR(dentry) ? (int)PTR_ERR(dentry) : -ENOENT);
+ if (IS_ERR(dentry))
+ cleanup_phase = 1;
+ GOTO(cleanup, rc = -ENOENT);
+ }
}
if (oa->o_valid & (OBD_MD_FLUID | OBD_MD_FLGID) &&
* filter truncates are serialized by i_alloc_sem, allowing
* multiple writes or single truncate. */
down_read(&dentry->d_inode->i_alloc_sem);
+ fsfilt_check_slow(obd, now, "i_alloc_sem");
/* Don't update inode timestamps if this write is older than a
* setattr which modifies the timestamps. b=10150 */
* so no sense in allocating it some more. We either return the grant
* back to the client if we have plenty of space or we don't return
* anything if we are short. This was decided in filter_grant_incoming*/
- if (oa->o_valid & OBD_MD_FLGRANT &&!(oa->o_valid & OBD_FL_SHRINK_GRANT))
+ if ((oa->o_valid & OBD_MD_FLGRANT) &&
+ (!(oa->o_valid & OBD_MD_FLFLAGS) ||
+ !(oa->o_flags & OBD_FL_SHRINK_GRANT)))
oa->o_grant = filter_grant(exp, oa->o_grant, oa->o_undirty,
left, 1);
lnb[i].page = pga[i].pg;
rnb[i].offset = pga[i].off;
rnb[i].len = pga[i].count;
+ lnb[i].flags = rnb[i].flags = pga[i].flag;
}
obdo_to_ioobj(oinfo->oi_oa, &ioo);