Commit 5fda1bd5 authored Mar 22, 2011 by Prarit Bhargava Committed by Linus Torvalds Mar 22, 2011

mm: notifier_from_errno() cleanup



While looking at some other notifier callbacks I noticed this code could
use a simple cleanup.

notifier_from_errno() no longer needs the if (ret)/else conditional.  That
same conditional is now done in notifier_from_errno().

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Cc: Paul Menage <menage@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cbf978bf

mm/page_cgroup.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -243,12 +243,7 @@ static int __meminit page_cgroup_callback(struct notifier_block *self,
		break;
		}

		if (ret)
		ret = notifier_from_errno(ret);
		else
		ret = NOTIFY_OK;

		return ret;
		return notifier_from_errno(ret);
		}

		#endif

mm/slab.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1390,7 +1390,7 @@ static int __meminit slab_memory_callback(struct notifier_block *self,
		break;
		}
		out:
		return ret ? notifier_from_errno(ret) : NOTIFY_OK;
		return notifier_from_errno(ret);
		}
		#endif /* CONFIG_NUMA && CONFIG_MEMORY_HOTPLUG */