Fix 2.6 build errors after b1_4 merge

diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c
index 13141b1..7821606 100644 (file)
--- a/lustre/obdfilter/filter_io_26.c
+++ b/lustre/obdfilter/filter_io_26.c
@@ -452,7 +452,7 @@ int filter_direct_io(int rw, struct dentry *dchild, struct filter_iobuf *iobuf,
                 create = 1;
                 sem = &obd->u.filter.fo_alloc_lock;
                 
-                lquota_enforce(quota_interface, obd, dreq->dr_ignore_quota);
+                lquota_enforce(quota_interface, obd, iobuf->dr_ignore_quota);
         }
 remap:
         rc = fsfilt_map_inode_pages(obd, inode, iobuf->dr_pages,
@@ -562,7 +562,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
         fso.fso_bufcnt = obj->ioo_bufcnt;
         inode = res->dentry->d_inode;
 
-        dreq->dr_ignore_quota = 0;
+        iobuf->dr_ignore_quota = 0;
         for (i = 0, lnb = res; i < obj->ioo_bufcnt; i++, lnb++) {
                 loff_t this_size;
 
@@ -591,7 +591,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
                  * written by root, then mark the whole io request as ignore 
                  * quota request */
                 if (lnb->flags & (OBD_BRW_FROM_GRANT | OBD_BRW_NOQUOTA))
-                        dreq->dr_ignore_quota = 1;
+                        iobuf->dr_ignore_quota = 1;
         }
 
         push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);

diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c
index 1a72640..101410a 100644 (file)
--- a/lustre/quota/quota_master.c
+++ b/lustre/quota/quota_master.c
@@ -1072,13 +1072,13 @@ int mds_quota_recovery(struct obd_device *obd)
         int rc = 0;
         ENTRY;
 
-        spin_lock(&lov->lov_lock);
+        down(&lov->lov_lock);
         if (lov->desc.ld_tgt_count != lov->desc.ld_active_tgt_count) {
                 CWARN("Not all osts are active, abort quota recovery\n");
-                spin_unlock(&lov->lov_lock);
+                up(&lov->lov_lock);
                 RETURN(rc);
         }
-        spin_unlock(&lov->lov_lock);
+        up(&lov->lov_lock);
 
         data.obd = obd;
         init_completion(&data.comp);