From: Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
penberg@cs.helsinki.fi, eduard.munteanu@linux360.ro,
viro@zeniv.linux.org.uk, tglx@linutronix.de, mingo@elte.hu,
adobriyan@gmail.com
Subject: [tip:tracing/kmemtrace] fs.h: uninline simple_transaction_set()
Date: Wed, 25 Mar 2009 16:51:28 GMT [thread overview]
Message-ID: <tip-44eea45ca9e25d6dd660d4806ef4c11209609e03@git.kernel.org> (raw)
In-Reply-To: <1237898630.25315.83.camel@penberg-laptop>
Commit-ID: 44eea45ca9e25d6dd660d4806ef4c11209609e03
Gitweb: http://git.kernel.org/tip/44eea45ca9e25d6dd660d4806ef4c11209609e03
Author: Ingo Molnar <mingo@elte.hu>
AuthorDate: Wed, 25 Mar 2009 16:48:35 +0100
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 25 Mar 2009 17:48:14 +0100
fs.h: uninline simple_transaction_set()
Move simple_transaction_set() to the other simple-transaction
file helpers in fs/libfs.c.
This removes an implicit asm/page.h PAGE_SIZE dependency from
fs.h (asm/page.h is not an exported header so HEADERS_CHECK fils),
and also reduces kernel size a bit.
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: paulmck@linux.vnet.ibm.com
LKML-Reference: <1237898630.25315.83.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
fs/libfs.c | 15 +++++++++++++++
include/linux/fs.h | 16 +---------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/fs/libfs.c b/fs/libfs.c
index 49b4409..a1db380 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -574,6 +574,21 @@ ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
* possibly a read which collects the result - which is stored in a
* file-local buffer.
*/
+
+void simple_transaction_set(struct file *file, size_t n)
+{
+ struct simple_transaction_argresp *ar = file->private_data;
+
+ BUG_ON(n > SIMPLE_TRANSACTION_LIMIT);
+
+ /*
+ * The barrier ensures that ar->size will really remain zero until
+ * ar->data is ready for reading.
+ */
+ smp_mb();
+ ar->size = n;
+}
+
char *simple_transaction_get(struct file *file, const char __user *buf, size_t size)
{
struct simple_transaction_argresp *ar;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 79be937..2ebe3ce 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -9,8 +9,6 @@
#include <linux/limits.h>
#include <linux/ioctl.h>
-#include <asm/page.h> /* for PAGE_SIZE */
-
/*
* It's silly to have NR_OPEN bigger than NR_FILE, but you can change
* the file limit at runtime and only root can increase the per-process
@@ -2173,19 +2171,7 @@ ssize_t simple_transaction_read(struct file *file, char __user *buf,
size_t size, loff_t *pos);
int simple_transaction_release(struct inode *inode, struct file *file);
-static inline void simple_transaction_set(struct file *file, size_t n)
-{
- struct simple_transaction_argresp *ar = file->private_data;
-
- BUG_ON(n > SIMPLE_TRANSACTION_LIMIT);
-
- /*
- * The barrier ensures that ar->size will really remain zero until
- * ar->data is ready for reading.
- */
- smp_mb();
- ar->size = n;
-}
+void simple_transaction_set(struct file *file, size_t n);
/*
* simple attribute files
next prev parent reply other threads:[~2009-03-25 16:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1237898630.25315.83.camel@penberg-laptop>
2009-03-25 15:18 ` [tip:tracing/kmemtrace] RCU, kmemtrace: fix linux/rcutree.h and linux/rcuclassic.h dependencies Ingo Molnar
2009-03-25 15:33 ` [tip:tracing/kmemtrace] fs, kmemtrace: fix linux/fdtable.h header file dependencies Ingo Molnar
2009-03-25 15:51 ` [tip:tracing/kmemtrace] rcutree: fix rcu_tree_trace.c data structure dependencies Ingo Molnar
2009-03-25 16:11 ` Ingo Molnar
2009-03-25 16:52 ` Paul E. McKenney
2009-03-25 16:57 ` Ingo Molnar
2009-03-26 3:34 ` Paul E. McKenney
2009-03-25 15:54 ` [tip:tracing/kmemtrace] fs, kmemtrace: fix fs.h's PAGE_SIZE dependency Ingo Molnar
2009-03-25 16:06 ` [tip:tracing/kmemtrace] rcutree: fix rcupreempt.c data structure dependencies Ingo Molnar
2009-03-25 16:51 ` Ingo Molnar [this message]
2009-03-25 17:01 ` [tip:tracing/kmemtrace] fs.h: uninline simple_transaction_set() Ingo Molnar
2009-03-26 15:48 ` Al Viro
2009-03-27 9:26 ` Ingo Molnar
2009-03-25 17:30 ` Ingo Molnar
2009-03-28 11:45 ` Ingo Molnar
2009-04-03 10:34 ` [tip:tracing/kmemtrace-v2] kmemtrace, fs: " Ingo Molnar
2009-04-03 10:34 ` [tip:tracing/kmemtrace-v2] kmemtrace, fs: fix linux/fdtable.h header file dependencies Ingo Molnar
2009-04-03 10:35 ` [tip:tracing/kmemtrace-v2] kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies Ingo Molnar
2009-04-03 10:36 ` [tip:tracing/kmemtrace-v2] kmemtrace, rcu: fix rcu_tree_trace.c data structure dependencies Ingo Molnar
2009-04-03 10:36 ` [tip:tracing/kmemtrace-v2] kmemtrace, rcu: fix rcupreempt.c " Ingo Molnar
2009-04-03 10:36 ` [tip:tracing/kmemtrace-v2] kmemtrace, rcu: don't include unnecessary headers, allow kmemtrace w/ tracepoints Eduard - Gabriel Munteanu
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=tip-44eea45ca9e25d6dd660d4806ef4c11209609e03@git.kernel.org \
--to=mingo@elte.hu \
--cc=adobriyan@gmail.com \
--cc=eduard.munteanu@linux360.ro \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=penberg@cs.helsinki.fi \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/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