SOURCES: kernel-desktop-reiser4.patch - removed one more patch, sh...

[sparky]

Author: sparky                       Date: Sun Nov 19 05:38:42 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- removed one more patch, should build now

---- Files affected:
SOURCES:
   kernel-desktop-reiser4.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-reiser4.patch
diff -u SOURCES/kernel-desktop-reiser4.patch:1.8 SOURCES/kernel-desktop-reiser4.patch:1.9
--- SOURCES/kernel-desktop-reiser4.patch:1.8	Sun Nov 19 06:18:35 2006
+++ SOURCES/kernel-desktop-reiser4.patch	Sun Nov 19 06:38:37 2006
@@ -18105,7 +18105,7 @@
 +	REISER4_IMMUTABLE = 2,
 +	/* inode was read from storage */
 +	REISER4_LOADED = 3,
-+	/* this bit is set for symlinks. inode->i_private points to target
++	/* this bit is set for symlinks. inode->u.generic_ip points to target
 +	   name of symlink. */
 +	REISER4_GENERIC_PTR_USED = 4,
 +	/* set if size of stat-data item for this inode is known. If this is
@@ -39132,8 +39132,8 @@
 +	 */
 +	reiser4_inode_data(symlink)->extmask |= (1 << SYMLINK_STAT);
 +
-+	assert("vs-838", symlink->i_private == NULL);
-+	symlink->i_private = (void *)data->name;
++	assert("vs-838", symlink->u.generic_ip == NULL);
++	symlink->u.generic_ip = (void *)data->name;
 +
 +	assert("vs-843", symlink->i_size == 0);
 +	INODE_SET_FIELD(symlink, i_size, strlen(data->name));
@@ -39141,14 +39141,14 @@
 +	/* insert stat data appended with data->name */
 +	result = inode_file_plugin(symlink)->write_sd_by_inode(symlink);
 +	if (result) {
-+		/* FIXME-VS: Make sure that symlink->i_private is not attached
++		/* FIXME-VS: Make sure that symlink->u.generic_ip is not attached
 +		   to kmalloced data */
 +		INODE_SET_FIELD(symlink, i_size, 0);
 +	} else {
-+		assert("vs-849", symlink->i_private
++		assert("vs-849", symlink->u.generic_ip
 +		       && inode_get_flag(symlink, REISER4_GENERIC_PTR_USED));
 +		assert("vs-850",
-+		       !memcmp((char *)symlink->i_private, data->name,
++		       !memcmp((char *)symlink->u.generic_ip, data->name,
 +			       (size_t) symlink->i_size + 1));
 +	}
 +	return result;
@@ -39166,8 +39166,8 @@
 +	assert("edward-801", inode_get_flag(inode, REISER4_GENERIC_PTR_USED));
 +	assert("vs-839", S_ISLNK(inode->i_mode));
 +
-+	kfree(inode->i_private);
-+	inode->i_private = NULL;
++	kfree(inode->u.generic_ip);
++	inode->u.generic_ip = NULL;
 +	inode_clr_flag(inode, REISER4_GENERIC_PTR_USED);
 +}
 +
@@ -42418,16 +42418,16 @@
 + *
 + * This is common implementation of vfs's followlink method of struct
 + * inode_operations.
-+ * Assumes that inode's i_private points to the content of symbolic link.
++ * Assumes that inode's generic_ip points to the content of symbolic link.
 + */
 +void *follow_link_common(struct dentry *dentry, struct nameidata *nd)
 +{
 +	assert("vs-851", S_ISLNK(dentry->d_inode->i_mode));
 +
-+	if (!dentry->d_inode->i_private
++	if (!dentry->d_inode->u.generic_ip
 +	    || !inode_get_flag(dentry->d_inode, REISER4_GENERIC_PTR_USED))
 +		return ERR_PTR(RETERR(-EINVAL));
-+	nd_set_link(nd, dentry->d_inode->i_private);
++	nd_set_link(nd, dentry->d_inode->u.generic_ip);
 +	return NULL;
 +}
 +
@@ -53207,21 +53207,21 @@
 +
 +/* symlink stat data extension */
 +
-+/* allocate memory for symlink target and attach it to inode->i_private */
++/* allocate memory for symlink target and attach it to inode->u.generic_ip */
 +static int
 +symlink_target_to_inode(struct inode *inode, const char *target, int len)
 +{
-+	assert("vs-845", inode->i_private == NULL);
++	assert("vs-845", inode->u.generic_ip == NULL);
 +	assert("vs-846", !inode_get_flag(inode, REISER4_GENERIC_PTR_USED));
 +
 +	/* FIXME-VS: this is prone to deadlock. Not more than other similar
 +	   places, though */
-+	inode->i_private = kmalloc((size_t) len + 1, get_gfp_mask());
-+	if (!inode->i_private)
++	inode->u.generic_ip = kmalloc((size_t) len + 1, get_gfp_mask());
++	if (!inode->u.generic_ip)
 +		return RETERR(-ENOMEM);
 +
-+	memcpy((char *)(inode->i_private), target, (size_t) len);
-+	((char *)(inode->i_private))[len] = 0;
++	memcpy((char *)(inode->u.generic_ip), target, (size_t) len);
++	((char *)(inode->u.generic_ip))[len] = 0;
 +	inode_set_flag(inode, REISER4_GENERIC_PTR_USED);
 +	return 0;
 +}
@@ -53276,8 +53276,8 @@
 +	if (!inode_get_flag(inode, REISER4_GENERIC_PTR_USED)) {
 +		const char *target;
 +
-+		target = (const char *)(inode->i_private);
-+		inode->i_private = NULL;
++		target = (const char *)(inode->u.generic_ip);
++		inode->u.generic_ip = NULL;
 +
 +		result = symlink_target_to_inode(inode, target, length);
 +
@@ -53287,7 +53287,7 @@
 +	} else {
 +		/* there is nothing to do in update but move area */
 +		assert("vs-844",
-+		       !memcmp(inode->i_private, sd->body,
++		       !memcmp(inode->u.generic_ip, sd->body,
 +			       (size_t) length + 1));
 +	}
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-reiser4.patch?r1=1.8&r2=1.9&f=u