From 42955e77f0db42c85ab55c2e9a57dd17dd222c7e Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 25 Mar 2009 16:48:35 +0100 Subject: [PATCH] --- yaml --- r: 142220 b: refs/heads/master c: 76791ab2d5e00c1eef728a8df4347ba133760fb8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/libfs.c | 16 ++++++++++++++++ trunk/include/linux/fs.h | 14 +------------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 511192ba1bef..248b2f4df12a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d544f411f2971eb82f5c52322251eb04494542a +refs/heads/master: 76791ab2d5e00c1eef728a8df4347ba133760fb8 diff --git a/trunk/fs/libfs.c b/trunk/fs/libfs.c index 4910a36f516e..cd223190c4e9 100644 --- a/trunk/fs/libfs.c +++ b/trunk/fs/libfs.c @@ -575,6 +575,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; @@ -820,6 +835,7 @@ EXPORT_SYMBOL(simple_sync_file); EXPORT_SYMBOL(simple_unlink); EXPORT_SYMBOL(simple_read_from_buffer); EXPORT_SYMBOL(memory_read_from_buffer); +EXPORT_SYMBOL(simple_transaction_set); EXPORT_SYMBOL(simple_transaction_get); EXPORT_SYMBOL(simple_transaction_read); EXPORT_SYMBOL(simple_transaction_release); diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index fc4dc28c5735..e4de2b543a73 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -2323,19 +2323,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