packages: kernel/kernel-reiser4.patch - updated

[arekm]

Author: arekm                        Date: Mon Jul 20 21:20:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated

---- Files affected:
packages/kernel:
   kernel-reiser4.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-reiser4.patch
diff -u packages/kernel/kernel-reiser4.patch:1.4 packages/kernel/kernel-reiser4.patch:1.5
--- packages/kernel/kernel-reiser4.patch:1.4	Mon Jul 20 15:14:57 2009
+++ packages/kernel/kernel-reiser4.patch	Mon Jul 20 23:20:49 2009
@@ -39396,8 +39396,8 @@
 +	if (!reiser4_inode_get_flag(inode, REISER4_NO_SD)) {
 +		reiser4_key sd_key;
 +
-+		DQUOT_FREE_INODE(inode);
-+		DQUOT_DROP(inode);
++		vfs_dq_free_inode(inode);
++		vfs_dq_drop(inode);
 +
 +		build_sd_key(inode, &sd_key);
 +		result =
@@ -40274,7 +40274,7 @@
 +		if ((attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid)
 +		    || (attr->ia_valid & ATTR_GID
 +			&& attr->ia_gid != inode->i_gid)) {
-+			result = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
++			result = vfs_dq_transfer(inode, attr) ? -EDQUOT : 0;
 +			if (result) {
 +				context_set_commit_async(ctx);
 +				reiser4_exit_context(ctx);
@@ -40412,8 +40412,8 @@
 +	/* So that on error iput will be called. */
 +	*retobj = object;
 +
-+	if (DQUOT_ALLOC_INODE(object)) {
-+		DQUOT_DROP(object);
++	if (vfs_dq_alloc_inode(object)) {
++		vfs_dq_drop(object);
 +		object->i_flags |= S_NOQUOTA;
 +		return RETERR(-EDQUOT);
 +	}
@@ -40427,7 +40427,7 @@
 +	if (result) {
 +		warning("nikita-431", "Cannot install plugin %i on %llx",
 +			data->id, (unsigned long long)get_inode_oid(object));
-+		DQUOT_FREE_INODE(object);
++		vfs_dq_free_inode(object);
 +		object->i_flags |= S_NOQUOTA;
 +		return result;
 +	}
@@ -40436,7 +40436,7 @@
 +	obj_plug = inode_file_plugin(object);
 +
 +	if (obj_plug->create_object == NULL) {
-+		DQUOT_FREE_INODE(object);
++		vfs_dq_free_inode(object);
 +		object->i_flags |= S_NOQUOTA;
 +		return RETERR(-EPERM);
 +	}
@@ -40455,7 +40455,7 @@
 +		warning("nikita-432", "Cannot inherit from %llx to %llx",
 +			(unsigned long long)get_inode_oid(parent),
 +			(unsigned long long)get_inode_oid(object));
-+		DQUOT_FREE_INODE(object);
++		vfs_dq_free_inode(object);
 +		object->i_flags |= S_NOQUOTA;
 +		return result;
 +	}
@@ -40471,7 +40471,7 @@
 +	/* obtain directory plugin (if any) for new object. */
 +	obj_dir = inode_dir_plugin(object);
 +	if (obj_dir != NULL && obj_dir->init == NULL) {
-+		DQUOT_FREE_INODE(object);
++		vfs_dq_free_inode(object);
 +		object->i_flags |= S_NOQUOTA;
 +		return RETERR(-EPERM);
 +	}
@@ -40480,7 +40480,7 @@
 +
 +	reserve = estimate_create_vfs_object(parent, object);
 +	if (reiser4_grab_space(reserve, BA_CAN_COMMIT)) {
-+		DQUOT_FREE_INODE(object);
++		vfs_dq_free_inode(object);
 +		object->i_flags |= S_NOQUOTA;
 +		return RETERR(-ENOSPC);
 +	}
@@ -40511,7 +40511,7 @@
 +			warning("nikita-2219",
 +				"Failed to create sd for %llu",
 +				(unsigned long long)get_inode_oid(object));
-+		DQUOT_FREE_INODE(object);
++		vfs_dq_free_inode(object);
 +		object->i_flags |= S_NOQUOTA;
 +		return result;
 +	}
@@ -40554,7 +40554,7 @@
 +	 */
 +	reiser4_update_sd(object);
 +	if (result != 0) {
-+		DQUOT_FREE_INODE(object);
++		vfs_dq_free_inode(object);
 +		object->i_flags |= S_NOQUOTA;
 +		/* if everything was ok (result == 0), parent stat-data is
 +		 * already updated above (update_parent_dir()) */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-reiser4.patch?r1=1.4&r2=1.5&f=u