2002-11-21 22:22:32

by Bob Miller

[permalink] [raw]
Subject: [TRIVIAL PATCH 2.5.48] Use min_t() instead of min() in fs/ntfs/attrib.c


This change removes a "duplicate 'const'" compiler warning.

diff -Nru a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
--- a/fs/ntfs/attrib.c Thu Nov 21 13:51:26 2002
+++ b/fs/ntfs/attrib.c Thu Nov 21 13:51:26 2002
@@ -1183,8 +1183,9 @@
register int rc;

rc = memcmp(val, (u8*)a + le16_to_cpu(
- a->_ARA(value_offset)), min(val_len,
- le32_to_cpu(a->_ARA(value_length))));
+ 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
* value, there is no matching attribute.
--
Bob Miller Email: [email protected]
Open Source Development Lab Phone: 503.626.2455 Ext. 17