diff options
-rw-r--r-- | fs/libfs.c | 16 | ||||
-rw-r--r-- | include/linux/fs.h | 14 |
2 files changed, 17 insertions, 13 deletions
diff --git a/fs/libfs.c b/fs/libfs.c index 4910a36f516e..cd223190c4e9 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
@@ -575,6 +575,21 @@ ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos, | |||
575 | * possibly a read which collects the result - which is stored in a | 575 | * possibly a read which collects the result - which is stored in a |
576 | * file-local buffer. | 576 | * file-local buffer. |
577 | */ | 577 | */ |
578 | |||
579 | void simple_transaction_set(struct file *file, size_t n) | ||
580 | { | ||
581 | struct simple_transaction_argresp *ar = file->private_data; | ||
582 | |||
583 | BUG_ON(n > SIMPLE_TRANSACTION_LIMIT); | ||
584 | |||
585 | /* | ||
586 | * The barrier ensures that ar->size will really remain zero until | ||
587 | * ar->data is ready for reading. | ||
588 | */ | ||
589 | smp_mb(); | ||
590 | ar->size = n; | ||
591 | } | ||
592 | |||
578 | char *simple_transaction_get(struct file *file, const char __user *buf, size_t size) | 593 | char *simple_transaction_get(struct file *file, const char __user *buf, size_t size) |
579 | { | 594 | { |
580 | struct simple_transaction_argresp *ar; | 595 | struct simple_transaction_argresp *ar; |
@@ -820,6 +835,7 @@ EXPORT_SYMBOL(simple_sync_file); | |||
820 | EXPORT_SYMBOL(simple_unlink); | 835 | EXPORT_SYMBOL(simple_unlink); |
821 | EXPORT_SYMBOL(simple_read_from_buffer); | 836 | EXPORT_SYMBOL(simple_read_from_buffer); |
822 | EXPORT_SYMBOL(memory_read_from_buffer); | 837 | EXPORT_SYMBOL(memory_read_from_buffer); |
838 | EXPORT_SYMBOL(simple_transaction_set); | ||
823 | EXPORT_SYMBOL(simple_transaction_get); | 839 | EXPORT_SYMBOL(simple_transaction_get); |
824 | EXPORT_SYMBOL(simple_transaction_read); | 840 | EXPORT_SYMBOL(simple_transaction_read); |
825 | EXPORT_SYMBOL(simple_transaction_release); | 841 | EXPORT_SYMBOL(simple_transaction_release); |
diff --git a/include/linux/fs.h b/include/linux/fs.h index fc4dc28c5735..e4de2b543a73 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -2323,19 +2323,7 @@ ssize_t simple_transaction_read(struct file *file, char __user *buf, | |||
2323 | size_t size, loff_t *pos); | 2323 | size_t size, loff_t *pos); |
2324 | int simple_transaction_release(struct inode *inode, struct file *file); | 2324 | int simple_transaction_release(struct inode *inode, struct file *file); |
2325 | 2325 | ||
2326 | static inline void simple_transaction_set(struct file *file, size_t n) | 2326 | void simple_transaction_set(struct file *file, size_t n); |
2327 | { | ||
2328 | struct simple_transaction_argresp *ar = file->private_data; | ||
2329 | |||
2330 | BUG_ON(n > SIMPLE_TRANSACTION_LIMIT); | ||
2331 | |||
2332 | /* | ||
2333 | * The barrier ensures that ar->size will really remain zero until | ||
2334 | * ar->data is ready for reading. | ||
2335 | */ | ||
2336 | smp_mb(); | ||
2337 | ar->size = n; | ||
2338 | } | ||
2339 | 2327 | ||
2340 | /* | 2328 | /* |
2341 | * simple attribute files | 2329 | * simple attribute files |