Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966527AbbBCSIM (ORCPT ); Tue, 3 Feb 2015 13:08:12 -0500 Received: from mailrelay111.isp.belgacom.be ([195.238.20.138]:56762 "EHLO mailrelay111.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756081AbbBCSIG (ORCPT ); Tue, 3 Feb 2015 13:08:06 -0500 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=o+amxqHLy7+dd/uQ+LUqZyoNQm/aGJUjZTPtnbq5Ku0= c=1 sm=2 a=Z4Rwk6OoAAAA:8 a=ZfUy6ZH7iFqj8_KAEDsA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DrEQCZDdFU/xvP9FFagwaBK7I7BQEBAQEBAQUBdpc5gR9EAQEBAQF9hDovI4EaN4gxAcYskQ2GBIl0HYQTBY5riUeKN4goIoFFATsdFIE9PTGCQgEBAQ From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Andrew Morton Subject: [PATCH 1/6 linux-next] FS/AFFS: replace min() with casting/constant suffix by min_t Date: Tue, 3 Feb 2015 19:07:52 +0100 Message-Id: <1422986877-13475-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2154 Lines: 66 This patch prepares for AFFSNAMEMAX definition Cc: Andrew Morton Signed-off-by: Fabian Frederick --- fs/affs/amigaffs.c | 2 +- fs/affs/dir.c | 2 +- fs/affs/namei.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index 511ab6b..7a6de60 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c @@ -508,7 +508,7 @@ affs_check_name(const unsigned char *name, int len, bool notruncate) int affs_copy_name(unsigned char *bstr, struct dentry *dentry) { - int len = min(dentry->d_name.len, 30u); + int len = min_t(u64, dentry->d_name.len, 30); *bstr++ = len; memcpy(bstr, dentry->d_name.name, len); diff --git a/fs/affs/dir.c b/fs/affs/dir.c index a682892..580b958 100644 --- a/fs/affs/dir.c +++ b/fs/affs/dir.c @@ -114,7 +114,7 @@ inside: break; } - namelen = min(AFFS_TAIL(sb, fh_bh)->name[0], (u8)30); + namelen = min_t(u8, AFFS_TAIL(sb, fh_bh)->name[0], 30); name = AFFS_TAIL(sb, fh_bh)->name + 1; pr_debug("readdir(): dir_emit(\"%.*s\", ino=%u), hash=%d, f_pos=%llx\n", namelen, name, ino, hash_pos, ctx->pos); diff --git a/fs/affs/namei.c b/fs/affs/namei.c index de84f4d..4a04c2d 100644 --- a/fs/affs/namei.c +++ b/fs/affs/namei.c @@ -71,7 +71,7 @@ __affs_hash_dentry(struct qstr *qstr, toupper_t toupper, bool notruncate) return i; hash = init_name_hash(); - i = min(qstr->len, 30u); + i = min_t(u64, qstr->len, 30); for (; i > 0; name++, i--) hash = partial_name_hash(toupper(*name), hash); qstr->hash = end_name_hash(hash); @@ -175,7 +175,7 @@ affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len) toupper_t toupper = affs_get_toupper(sb); int hash; - hash = len = min(len, 30u); + hash = len = min_t(unsigned, len, 30); for (; len > 0; len--) hash = (hash * 13 + toupper(*name++)) & 0x7ff; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/