Commit 4520ee79 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix warnings for NTFS

Patch from Stephen Hemminger <shemminger@osdl.org>
parent 9832a602
......@@ -1183,7 +1183,8 @@ BOOL find_attr(const ATTR_TYPES type, const uchar_t *name, const u32 name_len,
register int rc;
rc = memcmp(val, (u8*)a + le16_to_cpu(
a->_ARA(value_offset)), min(val_len,
a->_ARA(value_offset)),
min_t(const u32, val_len,
le32_to_cpu(a->_ARA(value_length))));
/*
* If @val collates before the current attribute's
......
......@@ -96,10 +96,10 @@ int ntfs_collate_names(const uchar_t *name1, const u32 name1_len,
const int err_val, const IGNORE_CASE_BOOL ic,
const uchar_t *upcase, const u32 upcase_len)
{
u32 cnt, min_len;
u32 cnt;
const u32 min_len = min_t(const u32, name1_len, name2_len);
uchar_t c1, c2;
min_len = min(name1_len, name2_len);
for (cnt = 0; cnt < min_len; ++cnt) {
c1 = le16_to_cpu(*name1++);
c2 = le16_to_cpu(*name2++);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment