PERFORCE change 178385 for review

[Zheng Liu]

http://p4web.freebsd.org/@@178385?ac=10

Change 178385 by lz at gnehzuil-freebsd on 2010/05/17 10:43:11

	       Add two macros to operate tree lock.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#12 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#7 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#12 (text+ko) ====

@@ -247,11 +247,13 @@
         bbp = (char *)bp->b_data;
         size = rp->rw_goal_size;
 
-        mtx_lock_spin(&fs->e2fs_rsv_lock);
+        /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/
+        EXT2_TREE_LOCK(fs);
 
         /* If tree is empty, then try to alloc according to bpref */
         if (RB_EMPTY(&fs->e2fs_rsv_tree)) {
-                mtx_unlock_spin(&fs->e2fs_rsv_lock);
+                /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/
+                EXT2_TREE_UNLOCK(fs);
                 /* bpref is not in this cylinder group.
                  * So try to allocate it in other group.
                  */
@@ -295,7 +297,8 @@
                 if (ret < 0) {
                         if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED)
                                 ext2_remove_rsv_win(fs, rp);
-                        mtx_unlock_spin(&fs->e2fs_rsv_lock);
+                        /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/
+                        EXT2_TREE_UNLOCK(fs);
 
                         EXT2_LOCK(ump);
                         if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0)
@@ -305,7 +308,8 @@
                                 return 0;
                         goto allocated1;
                 }
-                mtx_unlock_spin(&fs->e2fs_rsv_lock);
+                /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/
+                EXT2_TREE_UNLOCK(fs);
 
                 if (isclr(bbp, bpref) &&
                     bpref >= rp->rw_start &&
@@ -324,9 +328,11 @@
                 }
 
                 if (loc == end) {
-                        mtx_lock_spin(&fs->e2fs_rsv_lock);
+                        /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/
+                        EXT2_TREE_LOCK(fs);
                         ext2_remove_rsv_win(fs, rp);
-                        mtx_unlock_spin(&fs->e2fs_rsv_lock);
+                        /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/
+                        EXT2_TREE_UNLOCK(fs);
 
                         EXT2_LOCK(ump);
                         if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0)
@@ -342,9 +348,11 @@
         rp->rw_start = bpref + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock;
         rp->rw_end = rp->rw_start + size - 1;
         rp->rw_alloc_hit = 0;
-        mtx_lock_spin(&fs->e2fs_rsv_lock);
+        /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/
+        EXT2_TREE_LOCK(fs);
         ext2_add_rsv_win(fs, rp);
-        mtx_unlock_spin(&fs->e2fs_rsv_lock);
+        /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/
+        EXT2_TREE_UNLOCK(fs);
 
 allocated:
         rp->rw_alloc_hit = bpref - rp->rw_start + 1;
@@ -383,9 +391,11 @@
                 goto gotit;
         }
         
-        mtx_lock_spin(&fs->e2fs_rsv_lock);
+        /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/
+        EXT2_TREE_LOCK(fs);
         ext2_remove_rsv_win(fs, rp);
-        mtx_unlock_spin(&fs->e2fs_rsv_lock);
+        /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/
+        EXT2_TREE_UNLOCK(fs);
 
         EXT2_LOCK(ump);
         if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0)

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#7 (text+ko) ====

@@ -38,6 +38,9 @@
 #define EXT2_IRSV_LOCK(ip)   mtx_lock(&ip->i_rsv_lock)
 #define EXT2_IRSV_UNLOCK(ip) mtx_unlock(&ip->i_rsv_lock)
 
+#define EXT2_TREE_LOCK(fs)   mtx_lock_spin(&fs->e2fs_rsv_lock);
+#define EXT2_TREE_UNLOCK(fs) mtx_unlock_spin(&fs->e2fs_rsv_lock);
+
 /*
  * Reservation window entry
  */