rds: stop including asm-generic/bitops/le.h directly (12ce2242) · Commits · 戴 / test

asm-generic/bitops/le.h is only intended to be included directly from asm-generic/bitops/ext2-non-atomic.h or asm-generic/bitops/minix-le.h which implements generic ext2 or minix bit operations. This stops including asm-generic/bitops/le.h directly and use ext2 non-atomic bit operations instead. It seems odd to use ext2_*_bit() on rds, but it will replaced with __{set,clear,test}_bit_le() after introducing little endian bit operations for all architectures. This indirect step is necessary to maintain bisectability for some architectures which have their own little-endian bit operations. Signed-off-by:

Akinobu Mita <akinobu.mita@gmail.com> Cc: Andy Grover <andy.grover@oracle.com> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

net/rds/cong.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -33,8 +33,7 @@
		#include <linux/slab.h>
		#include <linux/types.h>
		#include <linux/rbtree.h>

		#include <asm-generic/bitops/le.h>
		#include <linux/bitops.h>

		#include "rds.h"

		@@ -285,7 +284,7 @@ void rds_cong_set_bit(struct rds_cong_map *map, __be16 port)
		i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS;
		off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS;

		generic___set_le_bit(off, (void *)map->m_page_addrs[i]);
		ext2_set_bit(off, (void *)map->m_page_addrs[i]);
		}

		void rds_cong_clear_bit(struct rds_cong_map *map, __be16 port)
		@@ -299,7 +298,7 @@ void rds_cong_clear_bit(struct rds_cong_map *map, __be16 port)
		i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS;
		off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS;

		generic___clear_le_bit(off, (void *)map->m_page_addrs[i]);
		ext2_clear_bit(off, (void *)map->m_page_addrs[i]);
		}

		static int rds_cong_test_bit(struct rds_cong_map *map, __be16 port)
		@@ -310,7 +309,7 @@ static int rds_cong_test_bit(struct rds_cong_map *map, __be16 port)
		i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS;
		off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS;

		return generic_test_le_bit(off, (void *)map->m_page_addrs[i]);
		return ext2_test_bit(off, (void *)map->m_page_addrs[i]);
		}

		void rds_cong_add_socket(struct rds_sock *rs)

Admin message