X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fext3-ea-in-inode-2.4.21-suse2.patch;h=0f0490bafe01e905765662ade2eae70fc0815b33;hb=090c677210ee2946d99c71412e4ff762bb300f4f;hp=edcf826957ef72bd13f4fe6363b0ef78f2d7bb7d;hpb=c843241715b13024a656fad4e465be20e7fc5c79;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch
index edcf826..0f0490b 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch
@@ -45,7 +45,7 @@ Index: linux-2.4.21-chaos/fs/ext3/inode.c
  			goto out_brelse;
  	}
 +	if (EXT3_I(inode)->i_state & EXT3_STATE_NEW)
-+		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb));
++		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb)); 
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
  	if(!(test_opt(inode->i_sb, NO_UID32))) {
  		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
@@ -179,7 +179,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +	/* try to find attribute in inode body */
 +	err = ext3_xattr_ibody_get(inode, name_index, name,
 +					buffer, buffer_size);
-+	if (err < 0)
++	if (err < 0) 
 +		/* search was unsuccessful, try to find EA in dedicated block */
 +		err = ext3_xattr_block_get(inode, name_index, name,
 +				buffer, buffer_size);
@@ -222,7 +222,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		return 0;
 +
 +	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
++	if (ret) 
 +		return ret;
 +	raw_inode = iloc.raw_inode;
 +
@@ -302,7 +302,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +	/* get list of attributes stored in inode body */
 +	error = ext3_xattr_ibody_list(inode, buffer, buffer_size);
 +	if (error < 0) {
-+		/* some error occured while collecting
++		/* some error occured while collecting 
 +		 * attributes in inode body */
 +		size = 0;
 +		goto cleanup;
@@ -315,12 +315,12 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		if (buffer_size <= 0) {
 +			buffer = NULL;
 +			buffer_size = 0;
-+		} else
++		} else 
 +			buffer += error;
 +	}
 +
 +	error = ext3_xattr_block_list(inode, buffer, buffer_size);
-+	if (error < 0)
++	if (error < 0) 
 +		/* listing was successful, so we return len */
 +		size = 0;
 +
@@ -426,7 +426,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +
 +/*
 + * ext3_xattr_block_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in EA block
 + */
 +int
@@ -444,7 +444,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 + * NOTE: free space includes space our attribute hold
 + */
 +int
-+ext3_xattr_ibody_find(struct inode *inode, int name_index,
++ext3_xattr_ibody_find(struct inode *inode, int name_index, 
 +		const char *name, struct ext3_xattr_entry *rentry, int *free)
 +{
 +	struct ext3_xattr_entry *last;
@@ -459,7 +459,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		return ret;
 +
 +	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
++	if (err) 
 +		return -EIO;
 +	raw_inode = iloc.raw_inode;
 +
@@ -568,7 +568,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +
 +/*
 + * ext3_xattr_inode_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in inode body
 + */
 +int
@@ -628,7 +628,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		}
 +		if (name_index == last->e_name_index &&
 +			name_len == last->e_name_len &&
-+			!memcmp(name, last->e_name, name_len))
++			!memcmp(name, last->e_name, name_len)) 
 +			here = last;
 +		else {
 +			/* we calculate all but our attribute
@@ -665,9 +665,9 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		e = (struct ext3_xattr_entry *) start;
 +		while (!IS_LAST_ENTRY(e)) {
 +			struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(e);
-+			int offs = le16_to_cpu(e->e_value_offs);
-+			if (offs < border)
-+				e->e_value_offs =
++			int offs = le16_to_cpu(e->e_value_offs); 
++			if (offs < border) 
++				e->e_value_offs = 
 +					cpu_to_le16(offs + size);
 +			e = next;
 +		}
@@ -752,7 +752,7 @@ Index: linux-2.4.21-chaos/include/linux/ext3_fs_i.h
  	 */
  	loff_t	i_disksize;
  
-+	/* on-disk additional length */
++	/* on-disk additional lenght */
 +	__u16 i_extra_isize;
 +
  	/*