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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Phillip Lougher
Date: Sunday, October 24, 2010 - 5:05 pm

This fixes a sparse with endian checking warning.

Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
---
  fs/squashfs/xattr.c |    9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
index 652b854..3876c36 100644
--- a/fs/squashfs/xattr.c
+++ b/fs/squashfs/xattr.c
@@ -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);
-- 
1.6.3.3

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/2] Squashfs: fix use of __le64 annotated variable, Phillip Lougher, (Sun Oct 24, 5:05 pm)