reiser4: roll back space grabbing fixes

@@ -270,6 +270,12 @@ reiser4_grab(reiser4_context * ctx, __u6
 
 	assert("vs-1276", ctx == get_current_context());
 
+	/* Do not grab anything on ro-mounted fs. */
+	if (rofs_super(ctx->super)) {
+		ctx->grab_enabled = 0;
+		return 0;
+	}
+
 	sbinfo = get_super_private(ctx->super);
 
 	spin_lock_reiser4_super(sbinfo);

@@ -294,6 +300,9 @@ reiser4_grab(reiser4_context * ctx, __u6
 
 	assert("nikita-2986", reiser4_check_block_counters(ctx->super));
 
+	/* disable grab space in current context */
+	ctx->grab_enabled = 0;
+
 unlock_and_ret:
 	spin_unlock_reiser4_super(sbinfo);
 

@@ -312,12 +321,6 @@ int reiser4_grab_space(__u64 count, reis
 	if (!(flags & BA_FORCE) && !is_grab_enabled(ctx))
 		return 0;
 
-	/* Do not grab anything on ro-mounted fs. */
-	if (rofs_super(ctx->super)) {
-		ctx->grab_enabled = 0;
-		return 0;
-	}
-
 	ret = reiser4_grab(ctx, count, flags);
 	if (ret == -ENOSPC) {
 

@@ -325,15 +328,10 @@ int reiser4_grab_space(__u64 count, reis
 		   present */
 		if (flags & BA_CAN_COMMIT) {
 			txnmgr_force_commit_all(ctx->super, 0);
+			ctx->grab_enabled = 1;
 			ret = reiser4_grab(ctx, count, flags);
 		}
 	}
-
-	if (ret == 0) {
-		/* disable grab space in current context */
-		ctx->grab_enabled = 0;
-	}
-
 	/*
 	 * allocation from reserved pool cannot fail. This is severe error.
 	 */

@@ -362,41 +360,37 @@ int reiser4_grab_reserved(struct super_b
 			  __u64 count, reiser4_ba_flags_t flags)
 {
 	reiser4_super_info_data *sbinfo = get_super_private(super);
-	int ret;
 
 	assert("nikita-3175", flags & BA_CAN_COMMIT);
 
 	/* Check the delete mutex already taken by us, we assume that
 	 * reading of machine word is atomic. */
 	if (sbinfo->delete_mutex_owner == current) {
-		ret = reiser4_grab_space(count,
-					(flags | BA_RESERVED) & ~BA_CAN_COMMIT);
-
-		if (ret != 0) {
+		if (reiser4_grab_space
+		    (count, (flags | BA_RESERVED) & ~BA_CAN_COMMIT)) {
 			warning("zam-1003",
-			      "nested call of grab_reserved fails count=(%llu)",
-			      (unsigned long long)count);
+				"nested call of grab_reserved fails count=(%llu)",
+				(unsigned long long)count);
 			reiser4_release_reserved(super);
+			return RETERR(-ENOSPC);
 		}
-	} else {
-		ret = reiser4_grab_space(count, flags);
+		return 0;
+	}
 
-		if (ret != 0) {
-			mutex_lock(&sbinfo->delete_mutex);
-			assert("nikita-2929",
-			       sbinfo->delete_mutex_owner == NULL);
-			sbinfo->delete_mutex_owner = current;
-			ret = reiser4_grab_space(count, flags | BA_RESERVED);
-
-			if (ret != 0) {
-				warning("zam-833",
-					"reserved space is not enough (%llu)",
-					(unsigned long long)count);
-				reiser4_release_reserved(super);
-			}
+	if (reiser4_grab_space(count, flags)) {
+		mutex_lock(&sbinfo->delete_mutex);
+		assert("nikita-2929", sbinfo->delete_mutex_owner == NULL);
+		sbinfo->delete_mutex_owner = current;
+
+		if (reiser4_grab_space(count, flags | BA_RESERVED)) {
+			warning("zam-833",
+				"reserved space is not enough (%llu)",
+				(unsigned long long)count);
+			reiser4_release_reserved(super);
+			return RETERR(-ENOSPC);
 		}
 	}
-	return ret;
+	return 0;
 }
 
 void reiser4_release_reserved(struct super_block *super)

@@ -335,10 +335,11 @@ static int find_file_state(struct inode
  */
 static int reserve_partial_page(reiser4_tree * tree)
 {
+	grab_space_enable();
 	return reiser4_grab_reserved(reiser4_get_current_sb(),
 				     1 +
 				     2 * estimate_one_insert_into_item(tree),
-				     BA_CAN_COMMIT | BA_FORCE);
+				     BA_CAN_COMMIT);
 }
 
 /* estimate and reserve space needed to cut one item and update one stat data */

@@ -349,10 +350,11 @@ static int reserve_cut_iteration(reiser4
 
 	assert("nikita-3172", lock_stack_isclean(get_current_lock_stack()));
 
+	grab_space_enable();
 	/* We need to double our estimate now that we can delete more than one
 	   node. */
 	return reiser4_grab_reserved(reiser4_get_current_sb(), estimate * 2,
-				     BA_CAN_COMMIT | BA_FORCE);
+				     BA_CAN_COMMIT);
 }
 
 int reiser4_update_file_size(struct inode *inode, loff_t new_size,

@@ -873,9 +875,10 @@ static int capture_page_and_create_exten
 	/* page capture may require extent creation (if it does not exist yet)
 	   and stat data's update (number of blocks changes on extent
 	   creation) */
+	grab_space_enable();
 	result = reiser4_grab_space(2 * estimate_one_insert_into_item
 				    (reiser4_tree_by_inode(inode)),
-				    BA_CAN_COMMIT | BA_FORCE);
+				    BA_CAN_COMMIT);
 	if (likely(!result))
 		result = find_or_create_extent(page);
 

@@ -2419,8 +2422,9 @@ static int unpack(struct file *filp, str
 
 		set_file_notail(inode);
 
+		grab_space_enable();
 		tograb = inode_file_plugin(inode)->estimate.update(inode);
-		result = reiser4_grab_space(tograb, BA_CAN_COMMIT | BA_FORCE);
+		result = reiser4_grab_space(tograb, BA_CAN_COMMIT);
 		result = reiser4_update_sd(inode);
 	}
 

@@ -388,13 +388,14 @@ static int reserve_cryptcompress2unixfil
 	 *     5. possible update of stat-data
 	 *
 	 */
+	grab_space_enable();
 	return reiser4_grab_space
 		(2 * tree->height +
 		 unformatted_nodes  +
 		 unformatted_nodes * estimate_one_insert_into_item(tree) +
 		 1 + estimate_one_insert_item(tree) +
 		 inode_file_plugin(inode)->estimate.update(inode),
-		 BA_CAN_COMMIT | BA_FORCE);
+		 BA_CAN_COMMIT);
 }
 
 /**

@@ -221,13 +221,13 @@ static int reserve_tail2extent_iteration
 	 *     5. possible update of stat-data
 	 *
 	 */
+	grab_space_enable();
 	return reiser4_grab_space
 	    (2 * tree->height +
 	     TAIL2EXTENT_PAGE_NUM +
 	     TAIL2EXTENT_PAGE_NUM * estimate_one_insert_into_item(tree) +
 	     1 + estimate_one_insert_item(tree) +
-	     inode_file_plugin(inode)->estimate.update(inode),
-	     BA_CAN_COMMIT | BA_FORCE);
+	     inode_file_plugin(inode)->estimate.update(inode), BA_CAN_COMMIT);
 }
 
 /* clear stat data's flag indicating that conversion is being converted */

@@ -235,9 +235,10 @@ static int complete_conversion(struct in
 {
 	int result;
 
+	grab_space_enable();
 	result =
 	    reiser4_grab_space(inode_file_plugin(inode)->estimate.update(inode),
-			       BA_CAN_COMMIT | BA_FORCE);
+			       BA_CAN_COMMIT);
 	if (result == 0) {
 		reiser4_inode_clr_flag(inode, REISER4_PART_MIXED);
 		result = reiser4_update_sd(inode);

@@ -551,12 +552,12 @@ static int reserve_extent2tail_iteration
 	 *
 	 *     4. possible update of stat-data
 	 */
+	grab_space_enable();
 	return reiser4_grab_space
 	    (estimate_one_item_removal(tree) +
 	     estimate_insert_flow(tree->height) +
 	     1 + estimate_one_insert_item(tree) +
-	     inode_file_plugin(inode)->estimate.update(inode),
-	     BA_CAN_COMMIT | BA_FORCE);
+	     inode_file_plugin(inode)->estimate.update(inode), BA_CAN_COMMIT);
 }
 
 /* for every page of file: read page, cut part of extent pointing to this page,

@@ -933,7 +933,8 @@ static int write_extent_reserve_space(st
 	count = estimate_one_insert_item(tree) +
 		WRITE_GRANULARITY * (1 + estimate_one_insert_into_item(tree)) +
 		estimate_one_insert_item(tree);
-	return reiser4_grab_space(count, BA_FORCE);
+	grab_space_enable();
+	return reiser4_grab_space(count, 0 /* flags */);
 }
 
 /*

@@ -603,7 +603,8 @@ static int write_extent_reserve_space(st
 	count = estimate_one_insert_item(tree) +
 		estimate_insert_flow(tree->height) +
 		estimate_one_insert_item(tree);
-	return reiser4_grab_space(count, BA_FORCE);
+	grab_space_enable();
+	return reiser4_grab_space(count, 0 /* flags */);
 }
 
 #define PAGE_PER_FLOW 4

@@ -130,11 +130,13 @@ int safe_link_grab(reiser4_tree * tree,
 {
 	int result;
 
+	grab_space_enable();
 	/* The sbinfo->delete_mutex can be taken here.
 	 * safe_link_release() should be called before leaving reiser4
 	 * context. */
 	result =
-	    reiser4_grab_reserved(tree->super, safe_link_tograb(tree), flags | BA_FORCE);
+	    reiser4_grab_reserved(tree->super, safe_link_tograb(tree), flags);
+	grab_space_enable();
 	return result;
 }