linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Weijie Yang <weijie.yang@samsung.com>
To: hughd@google.com
Cc: 'Andrew Morton' <akpm@linux-foundation.org>,
	'Minchan Kim' <minchan@kernel.org>,
	shli@kernel.org, 'Bob Liu' <bob.liu@oracle.com>,
	weijie.yang.kh@gmail.com, 'Heesub Shin' <heesub.shin@samsung.com>,
	mquzik@redhat.com, 'Linux-MM' <linux-mm@kvack.org>,
	'linux-kernel' <linux-kernel@vger.kernel.org>,
	stable@vger.kernel.org
Subject: [PATCH 6/8] mm/swap: remove swap_lock to simplify si_swapinfo()
Date: Mon, 27 Jan 2014 18:03:04 +0800	[thread overview]
Message-ID: <000901cf1b47$60f439c0$22dcad40$%yang@samsung.com> (raw)

Consider of performance and simplicity, this patch remove swap_lock
to simplify the si_swapinfo().

Because the system info we obtain through /proc or /sys interface is
just a snapshot, we don't need a very precise freeswap and totalswap count.
Some monitor tool will get these count at per-second period, so it is good
to performance.

Signed-off-by: Weijie Yang <weijie.yang@samsung.com>
---
 mm/swapfile.c |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 3023172..7332c3d 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2637,19 +2637,8 @@ out:
 
 void si_swapinfo(struct sysinfo *val)
 {
-	unsigned int type;
-	unsigned long nr_to_be_unused = 0;
-
-	spin_lock(&swap_lock);
-	for (type = 0; type < nr_swapfiles; type++) {
-		struct swap_info_struct *si = swap_info[type];
-
-		if ((si->flags & SWP_USED) && !(si->flags & SWP_WRITEOK))
-			nr_to_be_unused += si->inuse_pages;
-	}
-	val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused;
-	val->totalswap = total_swap_pages + nr_to_be_unused;
-	spin_unlock(&swap_lock);
+	val->freeswap = atomic_long_read(&nr_swap_pages);
+	val->totalswap = total_swap_pages;
 }
 
 /*
-- 
1.7.10.4


--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

                 reply	other threads:[~2014-01-27 10:06 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='000901cf1b47$60f439c0$22dcad40$%yang@samsung.com' \
    --to=weijie.yang@samsung.com \
    --cc=akpm@linux-foundation.org \
    --cc=bob.liu@oracle.com \
    --cc=heesub.shin@samsung.com \
    --cc=hughd@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=minchan@kernel.org \
    --cc=mquzik@redhat.com \
    --cc=shli@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=weijie.yang.kh@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox