From: Andy Whitcroft <apw@canonical.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Andy Whitcroft <apw@canonical.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
mszeredi@suse.cz, Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH 1/2] vfs: export do_splice_direct() to modules -- fix
Date: Thu, 27 Jun 2013 17:26:43 +0100 [thread overview]
Message-ID: <1372350404-10359-3-git-send-email-apw@canonical.com> (raw)
In-Reply-To: <1372350404-10359-1-git-send-email-apw@canonical.com>
The commit below moved the prototype for do_splice_direct to
fs/internal.h expose it:
commit 7995bd287134f6c8f80d94bebe7396f05a9bc42b
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu Jun 20 18:58:36 2013 +0400
splice: don't pass the address of ->f_pos to methods
[This should be merged down into:
vfs: export do_splice_direct() to modules.]
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
fs/internal.h | 6 ------
include/linux/fs.h | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/internal.h b/fs/internal.h
index 6dd0ffd..6c9ec69 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -127,12 +127,6 @@ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);
extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
/*
- * splice.c
- */
-extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
- loff_t *opos, size_t len, unsigned int flags);
-
-/*
* pipe.c
*/
extern const struct file_operations pipefifo_fops;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e623f11..baf1175 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2703,4 +2703,10 @@ static inline void inode_has_no_xattr(struct inode *inode)
inode->i_flags |= S_NOSEC;
}
+/*
+ * splice.c
+ */
+extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
+ loff_t *opos, size_t len, unsigned int flags);
+
#endif /* _LINUX_FS_H */
--
1.8.3.1
next prev parent reply other threads:[~2013-06-27 16:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-27 16:26 [PATCH 0/3] overlayfs fixes for v3.8 and later base Andy Whitcroft
2013-06-27 16:26 ` [PATCH 1/1] overlayfs -- ovl_path_open should not take path reference Andy Whitcroft
2013-06-27 16:26 ` Andy Whitcroft [this message]
2013-06-27 16:26 ` [PATCH 2/2] overlayfs -- follow change to do_splice_direct interface Andy Whitcroft
2013-06-27 16:37 ` Miklos Szeredi
2013-06-27 17:22 ` Andy Whitcroft
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=1372350404-10359-3-git-send-email-apw@canonical.com \
--to=apw@canonical.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=mszeredi@suse.cz \
--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
all inboxes | Powered by JetHome®