From: Richard Weinberger <richard@nod.at>
To: miklos@szeredi.hu
Cc: miquel.raynal@bootlin.com, vigneshr@ti.com,
boris.brezillon@collabora.com, rminnich@google.com,
sven@narfation.org, linux-kernel@vger.kernel.org,
linux-mtd@lists.infradead.org, fuse-devel@lists.sourceforge.net,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 2/8] fuse: Export IO helpers
Date: Mon, 25 Jan 2021 00:20:01 +0100 [thread overview]
Message-ID: <20210124232007.21639-3-richard@nod.at> (raw)
In-Reply-To: <20210124232007.21639-1-richard@nod.at>
MUSE will use this functions in its IO path,
so export them.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/fuse/file.c | 16 +++-------------
fs/fuse/fuse_i.h | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 8cccecb55fb8..d41660b7f5bc 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -20,8 +20,8 @@
#include <linux/uio.h>
#include <linux/fs.h>
-static struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags,
- struct fuse_page_desc **desc)
+struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags,
+ struct fuse_page_desc **desc)
{
struct page **pages;
@@ -31,6 +31,7 @@ static struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags,
return pages;
}
+EXPORT_SYMBOL_GPL(fuse_pages_alloc);
static int fuse_send_open(struct fuse_mount *fm, u64 nodeid, struct file *file,
int opcode, struct fuse_open_out *outargp)
@@ -1356,17 +1357,6 @@ static inline void fuse_page_descs_length_init(struct fuse_page_desc *descs,
descs[i].length = PAGE_SIZE - descs[i].offset;
}
-static inline unsigned long fuse_get_user_addr(const struct iov_iter *ii)
-{
- return (unsigned long)ii->iov->iov_base + ii->iov_offset;
-}
-
-static inline size_t fuse_get_frag_size(const struct iov_iter *ii,
- size_t max_size)
-{
- return min(iov_iter_single_seg_count(ii), max_size);
-}
-
static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii,
size_t *nbytesp, int write,
unsigned int max_pages)
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 7c4b8cb93f9f..8c56a3fd2c4e 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -31,6 +31,7 @@
#include <linux/pid_namespace.h>
#include <linux/refcount.h>
#include <linux/user_namespace.h>
+#include <linux/uio.h>
/** Default max number of pages that can be used in a single read request */
#define FUSE_DEFAULT_MAX_PAGES_PER_REQ 32
@@ -871,6 +872,17 @@ static inline bool fuse_is_bad(struct inode *inode)
return unlikely(test_bit(FUSE_I_BAD, &get_fuse_inode(inode)->state));
}
+static inline unsigned long fuse_get_user_addr(const struct iov_iter *ii)
+{
+ return (unsigned long)ii->iov->iov_base + ii->iov_offset;
+}
+
+static inline size_t fuse_get_frag_size(const struct iov_iter *ii,
+ size_t max_size)
+{
+ return min(iov_iter_single_seg_count(ii), max_size);
+}
+
/** Device operations */
extern const struct file_operations fuse_dev_operations;
@@ -1213,4 +1225,8 @@ void fuse_dax_inode_cleanup(struct inode *inode);
bool fuse_dax_check_alignment(struct fuse_conn *fc, unsigned int map_alignment);
void fuse_dax_cancel_work(struct fuse_conn *fc);
+/* file.c */
+struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags,
+ struct fuse_page_desc **desc);
+
#endif /* _FS_FUSE_I_H */
--
2.26.2
next prev parent reply other threads:[~2021-01-24 23:22 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 23:19 [PATCH 0/8] MUSE: Userspace backed MTD v3 Richard Weinberger
2021-01-24 23:20 ` [PATCH 1/8] fuse: Export fuse_simple_request Richard Weinberger
2021-01-24 23:20 ` Richard Weinberger [this message]
2021-01-24 23:20 ` [PATCH 3/8] fuse: Make cuse_parse_one a common helper Richard Weinberger
2021-01-24 23:20 ` [PATCH 4/8] mtd: Add MTD_MUSE flag Richard Weinberger
2021-01-24 23:20 ` [PATCH 5/8] mtd: Allow passing a custom cmdline to cmdline line parser Richard Weinberger
2021-01-24 23:20 ` [PATCH 6/8] fuse: Add MUSE specific defines FUSE interface Richard Weinberger
2021-01-24 23:20 ` [PATCH 7/8] fuse: Implement MUSE - MTD in userspace Richard Weinberger
2021-01-24 23:20 ` [PATCH 8/8] MAINTAINERS: Add entry for MUSE Richard Weinberger
2021-01-28 10:30 ` [PATCH 0/8] MUSE: Userspace backed MTD v3 Miquel Raynal
2021-02-01 13:14 ` Richard Weinberger
2021-02-01 13:55 ` Miklos Szeredi
2021-02-09 14:26 ` Miklos Szeredi
2021-02-09 14:35 ` Richard Weinberger
2021-02-09 15:10 ` [fuse-devel] " Luca Risolia
2021-02-09 15:22 ` Miklos Szeredi
2021-02-09 15:41 ` Richard Weinberger
2021-02-09 15:56 ` Luca Risolia
2021-02-09 16:04 ` Richard Weinberger
2021-02-09 16:28 ` Luca Risolia
2021-02-09 16:29 ` Richard Weinberger
2021-02-09 16:42 ` Luca Risolia
2021-02-09 16:50 ` Richard Weinberger
2021-02-09 17:46 ` Luca Risolia
2021-02-09 19:42 ` Miklos Szeredi
2021-02-09 20:06 ` Richard Weinberger
2021-02-10 10:12 ` Miklos Szeredi
2021-02-10 11:12 ` Richard Weinberger
2021-02-10 11:16 ` Miklos Szeredi
2021-02-11 18:09 ` Miklos Szeredi
2021-04-13 12:59 ` Miklos Szeredi
2021-02-09 21:39 ` Richard Weinberger
2021-02-10 10:16 ` Miklos Szeredi
2021-02-10 11:00 ` Richard Weinberger
2021-02-10 11:14 ` Miquel Raynal
2021-02-10 11:23 ` Richard Weinberger
2021-02-10 20:55 ` Miquel Raynal
2021-02-10 21:11 ` Richard Weinberger
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=20210124232007.21639-3-richard@nod.at \
--to=richard@nod.at \
--cc=boris.brezillon@collabora.com \
--cc=fuse-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miklos@szeredi.hu \
--cc=miquel.raynal@bootlin.com \
--cc=rminnich@google.com \
--cc=sven@narfation.org \
--cc=vigneshr@ti.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;
as well as URLs for NNTP newsgroup(s).