Skip to contentSkip to conversation

Squashfs: fix use of __le64 annotated variable

PATCH New Phillip Lougher 1 participant 1 message Oct 25, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Squashfs: fix use of __le64 annotated variable

This fixes a sparse with endian checking warning.

---
 fs/squashfs/xattr.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
fs/squashfs/xattr.c +5 -4
index 652b854..3876c36 100644
@@ -158,17 +158,18 @@ static int squashfs_xattr_get(struct inode *inode, int name_index,
 					strncmp(target, name, name_size) == 0) {
 			/* found xattr */
 			if (type & SQUASHFS_XATTR_VALUE_OOL) {
-				__le64 xattr;
+				__le64 xattr_val;
+				u64 xattr;
 				/* val is a reference to the real location */
 				err = squashfs_read_metadata(sb, &val, &start,
 						&offset, sizeof(val));
 				if (err < 0)
 					goto failed;
-				err = squashfs_read_metadata(sb, &xattr, &start,
-					 &offset, sizeof(xattr));
+				err = squashfs_read_metadata(sb, &xattr_val,
+					&start, &offset, sizeof(xattr_val));
 				if (err < 0)
 					goto failed;
-				xattr = le64_to_cpu(xattr);
+				xattr = le64_to_cpu(xattr_val);
 				start = SQUASHFS_XATTR_BLK(xattr) +
 							msblk->xattr_table;
 				offset = SQUASHFS_XATTR_OFFSET(xattr);
Signature · 1 line
1.6.3.3