summaryrefslogtreecommitdiffstats
path: root/fs/udf/inode.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
commit1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch)
tree357efc7b93f8f5102110d20d293f41360ec212fc /fs/udf/inode.c
parentaea27b2e18d69af87e673972246e66657b4fa274 (diff)
Merge with Linux 2.3.21.
Diffstat (limited to 'fs/udf/inode.c')
-rw-r--r--fs/udf/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 5e0aa576e..3cb450036 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -917,7 +917,7 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
inode->i_size = le64_to_cpu(fe->informationLength);
#if BITS_PER_LONG < 64
- if (le64_to_cpu(fe->informationLength) & 0xFFFFFFFF00000000)
+ if (le64_to_cpu(fe->informationLength) & 0xFFFFFFFF00000000ULL)
inode->i_size = (Uint32)-1;
#endif