Patchwork aufs on staging

login
register
mail settings
Submitter hooanon05@yahoo.co.jp
Date Dec. 7, 2009, 5:37 a.m.
Message ID <13339.1260164237@jrobl>
Download mbox | patch
Permalink /patch/40496/
State Not Applicable
Headers show

Comments

hooanon05@yahoo.co.jp - Dec. 7, 2009, 5:37 a.m.
Greg KH:
> Ok, if aufs relies on exports that Christoph is not going to accept,
> then there's nothing I can do to add the code to the kernel.
> 
> _unless_ the code will work if it is built in.  What symbols are needed
> by aufs, and is only to allow it to be built as a module, but not as a
> built-in filesystem?
> 
> If built-in will work, then it could work in staging, right?

The word 'export' I use here might be incorrect.
Strictly speaking, it is "make some functions global" instead of "export
symbols to external module."
Actually the aufs patches I sent to LKML were not to build aufs as a
module. It supports CONFIG_AUFS_FS=y only.
There exist another GIT tree to build aufs as a module.




Thanks
J. R. Okajima
Greg KH - Dec. 7, 2009, 11:53 p.m.
On Mon, Dec 07, 2009 at 02:37:17PM +0900, hooanon05@yahoo.co.jp wrote:
> 
> Greg KH:
> > Ok, if aufs relies on exports that Christoph is not going to accept,
> > then there's nothing I can do to add the code to the kernel.
> > 
> > _unless_ the code will work if it is built in.  What symbols are needed
> > by aufs, and is only to allow it to be built as a module, but not as a
> > built-in filesystem?
> > 
> > If built-in will work, then it could work in staging, right?
> 
> The word 'export' I use here might be incorrect.
> Strictly speaking, it is "make some functions global" instead of "export
> symbols to external module."
> Actually the aufs patches I sent to LKML were not to build aufs as a
> module. It supports CONFIG_AUFS_FS=y only.
> There exist another GIT tree to build aufs as a module.

Ok, thanks for the detailed responses.  I guess this rules out aufs to
go into the drivers/staging/ tree, sorry.

thanks,

greg k-h

Patch

diff --git a/fs/namei.c b/fs/namei.c
index d11f404..7d28f56 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1219,7 +1219,7 @@  out:
  * needs parent already locked. Doesn't follow mounts.
  * SMP-safe.
  */
-static struct dentry *lookup_hash(struct nameidata *nd)
+struct dentry *lookup_hash(struct nameidata *nd)
 {
 	int err;
 
@@ -1229,7 +1229,7 @@  static struct dentry *lookup_hash(struct nameidata *nd)
 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
 }
 
-static int __lookup_one_len(const char *name, struct qstr *this,
+int __lookup_one_len(const char *name, struct qstr *this,
 		struct dentry *base, int len)
 {
 	unsigned long hash;
diff --git a/fs/splice.c b/fs/splice.c
index 7394e9e..77184f0 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1051,8 +1051,8 @@  EXPORT_SYMBOL(generic_splice_sendpage);
 /*
  * Attempt to initiate a splice from pipe to file.
  */
-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-			   loff_t *ppos, size_t len, unsigned int flags)
+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+		    loff_t *ppos, size_t len, unsigned int flags)
 {
 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
 				loff_t *, size_t, unsigned int);
@@ -1078,9 +1078,9 @@  static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 /*
  * Attempt to initiate a splice from a file to a pipe.
  */
-static long do_splice_to(struct file *in, loff_t *ppos,
-			 struct pipe_inode_info *pipe, size_t len,
-			 unsigned int flags)
+long do_splice_to(struct file *in, loff_t *ppos,
+		  struct pipe_inode_info *pipe, size_t len,
+		  unsigned int flags)
 {
 	ssize_t (*splice_read)(struct file *, loff_t *,
 			       struct pipe_inode_info *, size_t, unsigned int);
diff --git a/include/linux/namei.h b/include/linux/namei.h
index ec0f607..1438153 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -75,6 +75,9 @@  extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry
 extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
 extern void release_open_intent(struct nameidata *);
 
+extern struct dentry *lookup_hash(struct nameidata *nd);
+extern int __lookup_one_len(const char *name, struct qstr *this,
+			    struct dentry *base, int len);
 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
 extern struct dentry *lookup_one_noperm(const char *, struct dentry *);
 
diff --git a/include/linux/splice.h b/include/linux/splice.h
index 18e7c7c..8393b5c 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -82,4 +82,10 @@  extern ssize_t splice_to_pipe(struct pipe_inode_info *,
 extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
 				      splice_direct_actor *);
 
+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+			   loff_t *ppos, size_t len, unsigned int flags);
+extern long do_splice_to(struct file *in, loff_t *ppos,
+			 struct pipe_inode_info *pipe, size_t len,
+			 unsigned int flags);
+
 #endif