[XFS] Handle null returned from xfs_vtoi() in xfs_setfilesize().

[linux-2.6] / fs / xfs / xfs_arch.h

diff --git a/fs/xfs/xfs_arch.h b/fs/xfs/xfs_arch.h
index f1aeda599eb109f98dec6e6b7cd71275d4eab0aa..c4836890b7268bce37384b4ed35c261c1ec8805e 100644 (file)
--- a/fs/xfs/xfs_arch.h
+++ b/fs/xfs/xfs_arch.h
@@ -44,7 +44,7 @@
 #define cpu_to_be16(val)       ((__be16)(val))
 #define cpu_to_be32(val)       ((__be32)(val))
 #define cpu_to_be64(val)       ((__be64)(val))
-#define be16_to_cpu(val)       ((__uint16_t)(val)
+#define be16_to_cpu(val)       ((__uint16_t)(val))
 #define be32_to_cpu(val)       ((__uint32_t)(val))
 #define be64_to_cpu(val)       ((__uint64_t)(val))
 #else
@@ -202,7 +202,7 @@ static inline void be64_add(__be64 *a, __s64 b)
  */ 
 
 #define XFS_GET_DIR_INO4(di) \
-       (((u32)(di).i[0] << 24) | ((di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))
+       (((__u32)(di).i[0] << 24) | ((di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))
 
 #define XFS_PUT_DIR_INO4(from, di) \
 do { \
@@ -213,9 +213,9 @@ do { \
 } while (0)
 
 #define XFS_DI_HI(di) \
-       (((u32)(di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))
+       (((__u32)(di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))
 #define XFS_DI_LO(di) \
-       (((u32)(di).i[4] << 24) | ((di).i[5] << 16) | ((di).i[6] << 8) | ((di).i[7]))
+       (((__u32)(di).i[4] << 24) | ((di).i[5] << 16) | ((di).i[6] << 8) | ((di).i[7]))
 
 #define XFS_GET_DIR_INO8(di)        \
        (((xfs_ino_t)XFS_DI_LO(di) & 0xffffffffULL) | \