Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1270163 > unrolled thread

[PATCH 1/3] misc: mic/scif: use list_next_entry instead of list_entry_next

Started byGeliang Tang <geliangtang@163.com>
First post2015-11-16 14:50 +0100
Last post2015-11-16 18:20 +0100
Articles 5 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/3] misc: mic/scif: use list_next_entry instead of list_entry_next Geliang Tang <geliangtang@163.com> - 2015-11-16 14:50 +0100
    [PATCH 3/3] apparmor: use list_next_entry instead of list_entry_next Geliang Tang <geliangtang@163.com> - 2015-11-16 14:50 +0100
      Re: [PATCH 3/3] apparmor: use list_next_entry instead of  list_entry_next "Serge E. Hallyn" <serge.hallyn@ubuntu.com> - 2015-11-18 04:50 +0100
      Re: [PATCH 3/3] apparmor: use list_next_entry instead of  list_entry_next John Johansen <john.johansen@canonical.com> - 2015-11-18 06:10 +0100
    Re: [PATCH 1/3] misc: mic/scif: use list_next_entry instead of  list_entry_next Sudeep Dutt <sudeep.dutt@intel.com> - 2015-11-16 18:20 +0100

#1270163 — [PATCH 1/3] misc: mic/scif: use list_next_entry instead of list_entry_next

FromGeliang Tang <geliangtang@163.com>
Date2015-11-16 14:50 +0100
Subject[PATCH 1/3] misc: mic/scif: use list_next_entry instead of list_entry_next
Message-ID<qvskp-7Yr-5@gated-at.bofh.it>
list_next_entry has been defined in list.h, so I replace list_entry_next
with it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 drivers/misc/mic/scif/scif_dma.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/misc/mic/scif/scif_dma.c b/drivers/misc/mic/scif/scif_dma.c
index 95a13c6..8804bcc 100644
--- a/drivers/misc/mic/scif/scif_dma.c
+++ b/drivers/misc/mic/scif/scif_dma.c
@@ -74,11 +74,6 @@ struct scif_copy_work {
 	bool ordered;
 };
 
-#ifndef list_entry_next
-#define list_entry_next(pos, member) \
-	list_entry(pos->member.next, typeof(*pos), member)
-#endif
-
 /**
  * scif_reserve_dma_chan:
  * @ep: Endpoint Descriptor.
@@ -851,7 +846,7 @@ static void scif_rma_local_cpu_copy(s64 offset, struct scif_window *window,
 		(window->nr_pages << PAGE_SHIFT);
 	while (rem_len) {
 		if (offset == end_offset) {
-			window = list_entry_next(window, list);
+			window = list_next_entry(window, list);
 			end_offset = window->offset +
 				(window->nr_pages << PAGE_SHIFT);
 		}
@@ -957,7 +952,7 @@ scif_rma_list_dma_copy_unaligned(struct scif_copy_work *work,
 	remaining_len -= tail_len;
 	while (remaining_len) {
 		if (offset == end_offset) {
-			window = list_entry_next(window, list);
+			window = list_next_entry(window, list);
 			end_offset = window->offset +
 				(window->nr_pages << PAGE_SHIFT);
 		}
@@ -1064,7 +1059,7 @@ scif_rma_list_dma_copy_unaligned(struct scif_copy_work *work,
 	}
 	if (tail_len) {
 		if (offset == end_offset) {
-			window = list_entry_next(window, list);
+			window = list_next_entry(window, list);
 			end_offset = window->offset +
 				(window->nr_pages << PAGE_SHIFT);
 		}
@@ -1147,13 +1142,13 @@ static int _scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
 		(dst_window->nr_pages << PAGE_SHIFT);
 	while (remaining_len) {
 		if (src_offset == end_src_offset) {
-			src_window = list_entry_next(src_window, list);
+			src_window = list_next_entry(src_window, list);
 			end_src_offset = src_window->offset +
 				(src_window->nr_pages << PAGE_SHIFT);
 			scif_init_window_iter(src_window, &src_win_iter);
 		}
 		if (dst_offset == end_dst_offset) {
-			dst_window = list_entry_next(dst_window, list);
+			dst_window = list_next_entry(dst_window, list);
 			end_dst_offset = dst_window->offset +
 				(dst_window->nr_pages << PAGE_SHIFT);
 			scif_init_window_iter(dst_window, &dst_win_iter);
@@ -1314,13 +1309,13 @@ static int scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
 	remaining_len -= tail_len;
 	while (remaining_len) {
 		if (src_offset == end_src_offset) {
-			src_window = list_entry_next(src_window, list);
+			src_window = list_next_entry(src_window, list);
 			end_src_offset = src_window->offset +
 				(src_window->nr_pages << PAGE_SHIFT);
 			scif_init_window_iter(src_window, &src_win_iter);
 		}
 		if (dst_offset == end_dst_offset) {
-			dst_window = list_entry_next(dst_window, list);
+			dst_window = list_next_entry(dst_window, list);
 			end_dst_offset = dst_window->offset +
 				(dst_window->nr_pages << PAGE_SHIFT);
 			scif_init_window_iter(dst_window, &dst_win_iter);
@@ -1405,9 +1400,9 @@ static int scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
 	if (remaining_len) {
 		loop_len = remaining_len;
 		if (src_offset == end_src_offset)
-			src_window = list_entry_next(src_window, list);
+			src_window = list_next_entry(src_window, list);
 		if (dst_offset == end_dst_offset)
-			dst_window = list_entry_next(dst_window, list);
+			dst_window = list_next_entry(dst_window, list);
 
 		src_dma_addr = __scif_off_to_dma_addr(src_window, src_offset);
 		dst_dma_addr = __scif_off_to_dma_addr(dst_window, dst_offset);
@@ -1550,12 +1545,12 @@ static int scif_rma_list_cpu_copy(struct scif_copy_work *work)
 			end_dst_offset = dst_window->offset +
 				(dst_window->nr_pages << PAGE_SHIFT);
 			if (src_offset == end_src_offset) {
-				src_window = list_entry_next(src_window, list);
+				src_window = list_next_entry(src_window, list);
 				scif_init_window_iter(src_window,
 						      &src_win_iter);
 			}
 			if (dst_offset == end_dst_offset) {
-				dst_window = list_entry_next(dst_window, list);
+				dst_window = list_next_entry(dst_window, list);
 				scif_init_window_iter(dst_window,
 						      &dst_win_iter);
 			}
-- 
2.5.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/

[toc] | [next] | [standalone]

#1270166 — [PATCH 3/3] apparmor: use list_next_entry instead of list_entry_next

FromGeliang Tang <geliangtang@163.com>
Date2015-11-16 14:50 +0100
Subject[PATCH 3/3] apparmor: use list_next_entry instead of list_entry_next
Message-ID<qvskr-7Yr-45@gated-at.bofh.it>
In reply to#1270163
list_next_entry has been defined in list.h, so I replace list_entry_next
with it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 security/apparmor/apparmorfs.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index ad4fa49..7a00bb7 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -550,8 +550,6 @@ fail2:
 }
 
 
-#define list_entry_next(pos, member) \
-	list_entry(pos->member.next, typeof(*pos), member)
 #define list_entry_is_head(pos, head, member) (&pos->member == (head))
 
 /**
@@ -582,7 +580,7 @@ static struct aa_namespace *__next_namespace(struct aa_namespace *root,
 	parent = ns->parent;
 	while (ns != root) {
 		mutex_unlock(&ns->lock);
-		next = list_entry_next(ns, base.list);
+		next = list_next_entry(ns, base.list);
 		if (!list_entry_is_head(next, &parent->sub_ns, base.list)) {
 			mutex_lock(&next->lock);
 			return next;
@@ -636,7 +634,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
 	parent = rcu_dereference_protected(p->parent,
 					   mutex_is_locked(&p->ns->lock));
 	while (parent) {
-		p = list_entry_next(p, base.list);
+		p = list_next_entry(p, base.list);
 		if (!list_entry_is_head(p, &parent->base.profiles, base.list))
 			return p;
 		p = parent;
@@ -645,7 +643,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
 	}
 
 	/* is next another profile in the namespace */
-	p = list_entry_next(p, base.list);
+	p = list_next_entry(p, base.list);
 	if (!list_entry_is_head(p, &ns->base.profiles, base.list))
 		return p;
 
-- 
2.5.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/

[toc] | [prev] | [next] | [standalone]

#1271835 — Re: [PATCH 3/3] apparmor: use list_next_entry instead of list_entry_next

From"Serge E. Hallyn" <serge.hallyn@ubuntu.com>
Date2015-11-18 04:50 +0100
SubjectRe: [PATCH 3/3] apparmor: use list_next_entry instead of list_entry_next
Message-ID<qw1US-5MT-7@gated-at.bofh.it>
In reply to#1270166
On Mon, Nov 16, 2015 at 09:46:33PM +0800, Geliang Tang wrote:
> list_next_entry has been defined in list.h, so I replace list_entry_next
> with it.
> 
> Signed-off-by: Geliang Tang <geliangtang@163.com>

Seems reasonable.

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>

> ---
>  security/apparmor/apparmorfs.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index ad4fa49..7a00bb7 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -550,8 +550,6 @@ fail2:
>  }
>  
>  
> -#define list_entry_next(pos, member) \
> -	list_entry(pos->member.next, typeof(*pos), member)
>  #define list_entry_is_head(pos, head, member) (&pos->member == (head))
>  
>  /**
> @@ -582,7 +580,7 @@ static struct aa_namespace *__next_namespace(struct aa_namespace *root,
>  	parent = ns->parent;
>  	while (ns != root) {
>  		mutex_unlock(&ns->lock);
> -		next = list_entry_next(ns, base.list);
> +		next = list_next_entry(ns, base.list);
>  		if (!list_entry_is_head(next, &parent->sub_ns, base.list)) {
>  			mutex_lock(&next->lock);
>  			return next;
> @@ -636,7 +634,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
>  	parent = rcu_dereference_protected(p->parent,
>  					   mutex_is_locked(&p->ns->lock));
>  	while (parent) {
> -		p = list_entry_next(p, base.list);
> +		p = list_next_entry(p, base.list);
>  		if (!list_entry_is_head(p, &parent->base.profiles, base.list))
>  			return p;
>  		p = parent;
> @@ -645,7 +643,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
>  	}
>  
>  	/* is next another profile in the namespace */
> -	p = list_entry_next(p, base.list);
> +	p = list_next_entry(p, base.list);
>  	if (!list_entry_is_head(p, &ns->base.profiles, base.list))
>  		return p;
>  
> -- 
> 2.5.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/

[toc] | [prev] | [next] | [standalone]

#1271849 — Re: [PATCH 3/3] apparmor: use list_next_entry instead of list_entry_next

FromJohn Johansen <john.johansen@canonical.com>
Date2015-11-18 06:10 +0100
SubjectRe: [PATCH 3/3] apparmor: use list_next_entry instead of list_entry_next
Message-ID<qw3ai-6MR-13@gated-at.bofh.it>
In reply to#1270166
On 11/16/2015 05:46 AM, Geliang Tang wrote:
> list_next_entry has been defined in list.h, so I replace list_entry_next
> with it.
> 
> Signed-off-by: Geliang Tang <geliangtang@163.com>

yep looks good

Acked-by: John Johansen <john.johansen@canonical.com>

> ---
>  security/apparmor/apparmorfs.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index ad4fa49..7a00bb7 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -550,8 +550,6 @@ fail2:
>  }
>  
>  
> -#define list_entry_next(pos, member) \
> -	list_entry(pos->member.next, typeof(*pos), member)
>  #define list_entry_is_head(pos, head, member) (&pos->member == (head))
>  
>  /**
> @@ -582,7 +580,7 @@ static struct aa_namespace *__next_namespace(struct aa_namespace *root,
>  	parent = ns->parent;
>  	while (ns != root) {
>  		mutex_unlock(&ns->lock);
> -		next = list_entry_next(ns, base.list);
> +		next = list_next_entry(ns, base.list);
>  		if (!list_entry_is_head(next, &parent->sub_ns, base.list)) {
>  			mutex_lock(&next->lock);
>  			return next;
> @@ -636,7 +634,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
>  	parent = rcu_dereference_protected(p->parent,
>  					   mutex_is_locked(&p->ns->lock));
>  	while (parent) {
> -		p = list_entry_next(p, base.list);
> +		p = list_next_entry(p, base.list);
>  		if (!list_entry_is_head(p, &parent->base.profiles, base.list))
>  			return p;
>  		p = parent;
> @@ -645,7 +643,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
>  	}
>  
>  	/* is next another profile in the namespace */
> -	p = list_entry_next(p, base.list);
> +	p = list_next_entry(p, base.list);
>  	if (!list_entry_is_head(p, &ns->base.profiles, base.list))
>  		return p;
>  
> 

--
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/

[toc] | [prev] | [next] | [standalone]

#1270391 — Re: [PATCH 1/3] misc: mic/scif: use list_next_entry instead of list_entry_next

FromSudeep Dutt <sudeep.dutt@intel.com>
Date2015-11-16 18:20 +0100
SubjectRe: [PATCH 1/3] misc: mic/scif: use list_next_entry instead of list_entry_next
Message-ID<qvvBD-1Ii-3@gated-at.bofh.it>
In reply to#1270163
On Mon, 2015-11-16 at 21:46 +0800, Geliang Tang wrote:
> list_next_entry has been defined in list.h, so I replace list_entry_next
> with it.
> 

Thanks for the cleanup.

Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com>

> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
>  drivers/misc/mic/scif/scif_dma.c | 27 +++++++++++----------------
>  1 file changed, 11 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/misc/mic/scif/scif_dma.c b/drivers/misc/mic/scif/scif_dma.c
> index 95a13c6..8804bcc 100644
> --- a/drivers/misc/mic/scif/scif_dma.c
> +++ b/drivers/misc/mic/scif/scif_dma.c
> @@ -74,11 +74,6 @@ struct scif_copy_work {
>  	bool ordered;
>  };
>  
> -#ifndef list_entry_next
> -#define list_entry_next(pos, member) \
> -	list_entry(pos->member.next, typeof(*pos), member)
> -#endif
> -
>  /**
>   * scif_reserve_dma_chan:
>   * @ep: Endpoint Descriptor.
> @@ -851,7 +846,7 @@ static void scif_rma_local_cpu_copy(s64 offset, struct scif_window *window,
>  		(window->nr_pages << PAGE_SHIFT);
>  	while (rem_len) {
>  		if (offset == end_offset) {
> -			window = list_entry_next(window, list);
> +			window = list_next_entry(window, list);
>  			end_offset = window->offset +
>  				(window->nr_pages << PAGE_SHIFT);
>  		}
> @@ -957,7 +952,7 @@ scif_rma_list_dma_copy_unaligned(struct scif_copy_work *work,
>  	remaining_len -= tail_len;
>  	while (remaining_len) {
>  		if (offset == end_offset) {
> -			window = list_entry_next(window, list);
> +			window = list_next_entry(window, list);
>  			end_offset = window->offset +
>  				(window->nr_pages << PAGE_SHIFT);
>  		}
> @@ -1064,7 +1059,7 @@ scif_rma_list_dma_copy_unaligned(struct scif_copy_work *work,
>  	}
>  	if (tail_len) {
>  		if (offset == end_offset) {
> -			window = list_entry_next(window, list);
> +			window = list_next_entry(window, list);
>  			end_offset = window->offset +
>  				(window->nr_pages << PAGE_SHIFT);
>  		}
> @@ -1147,13 +1142,13 @@ static int _scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
>  		(dst_window->nr_pages << PAGE_SHIFT);
>  	while (remaining_len) {
>  		if (src_offset == end_src_offset) {
> -			src_window = list_entry_next(src_window, list);
> +			src_window = list_next_entry(src_window, list);
>  			end_src_offset = src_window->offset +
>  				(src_window->nr_pages << PAGE_SHIFT);
>  			scif_init_window_iter(src_window, &src_win_iter);
>  		}
>  		if (dst_offset == end_dst_offset) {
> -			dst_window = list_entry_next(dst_window, list);
> +			dst_window = list_next_entry(dst_window, list);
>  			end_dst_offset = dst_window->offset +
>  				(dst_window->nr_pages << PAGE_SHIFT);
>  			scif_init_window_iter(dst_window, &dst_win_iter);
> @@ -1314,13 +1309,13 @@ static int scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
>  	remaining_len -= tail_len;
>  	while (remaining_len) {
>  		if (src_offset == end_src_offset) {
> -			src_window = list_entry_next(src_window, list);
> +			src_window = list_next_entry(src_window, list);
>  			end_src_offset = src_window->offset +
>  				(src_window->nr_pages << PAGE_SHIFT);
>  			scif_init_window_iter(src_window, &src_win_iter);
>  		}
>  		if (dst_offset == end_dst_offset) {
> -			dst_window = list_entry_next(dst_window, list);
> +			dst_window = list_next_entry(dst_window, list);
>  			end_dst_offset = dst_window->offset +
>  				(dst_window->nr_pages << PAGE_SHIFT);
>  			scif_init_window_iter(dst_window, &dst_win_iter);
> @@ -1405,9 +1400,9 @@ static int scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
>  	if (remaining_len) {
>  		loop_len = remaining_len;
>  		if (src_offset == end_src_offset)
> -			src_window = list_entry_next(src_window, list);
> +			src_window = list_next_entry(src_window, list);
>  		if (dst_offset == end_dst_offset)
> -			dst_window = list_entry_next(dst_window, list);
> +			dst_window = list_next_entry(dst_window, list);
>  
>  		src_dma_addr = __scif_off_to_dma_addr(src_window, src_offset);
>  		dst_dma_addr = __scif_off_to_dma_addr(dst_window, dst_offset);
> @@ -1550,12 +1545,12 @@ static int scif_rma_list_cpu_copy(struct scif_copy_work *work)
>  			end_dst_offset = dst_window->offset +
>  				(dst_window->nr_pages << PAGE_SHIFT);
>  			if (src_offset == end_src_offset) {
> -				src_window = list_entry_next(src_window, list);
> +				src_window = list_next_entry(src_window, list);
>  				scif_init_window_iter(src_window,
>  						      &src_win_iter);
>  			}
>  			if (dst_offset == end_dst_offset) {
> -				dst_window = list_entry_next(dst_window, list);
> +				dst_window = list_next_entry(dst_window, list);
>  				scif_init_window_iter(dst_window,
>  						      &dst_win_iter);
>  			}


--
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/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web