84 lines
3.2 KiB
Diff
84 lines
3.2 KiB
Diff
|
aufs3.x-rcN base patch
|
||
|
|
|
||
|
|
diff --git a/fs/file_table.c b/fs/file_table.c
|
||
|
|
index a72bf9d..dac6792 100644
|
||
|
|
--- a/fs/file_table.c
|
||
|
|
+++ b/fs/file_table.c
|
||
|
|
@@ -36,7 +36,7 @@ struct files_stat_struct files_stat = {
|
||
|
|
.max_files = NR_FILE
|
||
|
|
};
|
||
|
|
|
||
|
|
-DEFINE_STATIC_LGLOCK(files_lglock);
|
||
|
|
+DEFINE_LGLOCK(files_lglock);
|
||
|
|
|
||
|
|
/* SLAB cache for file structures */
|
||
|
|
static struct kmem_cache *filp_cachep __read_mostly;
|
||
|
|
diff --git a/fs/inode.c b/fs/inode.c
|
||
|
|
index b03c719..ee497f9 100644
|
||
|
|
--- a/fs/inode.c
|
||
|
|
+++ b/fs/inode.c
|
||
|
|
@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
|
||
|
|
* This does the actual work of updating an inodes time or version. Must have
|
||
|
|
* had called mnt_want_write() before calling this.
|
||
|
|
*/
|
||
|
|
-static int update_time(struct inode *inode, struct timespec *time, int flags)
|
||
|
|
+int update_time(struct inode *inode, struct timespec *time, int flags)
|
||
|
|
{
|
||
|
|
if (inode->i_op->update_time)
|
||
|
|
return inode->i_op->update_time(inode, time, flags);
|
||
|
|
diff --git a/fs/splice.c b/fs/splice.c
|
||
|
|
index 13e5b47..f185c6c 100644
|
||
|
|
--- a/fs/splice.c
|
||
|
|
+++ b/fs/splice.c
|
||
|
|
@@ -1093,8 +1093,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);
|
||
|
|
@@ -1121,9 +1121,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/fs.h b/include/linux/fs.h
|
||
|
|
index b33cfc9..963a61b 100644
|
||
|
|
--- a/include/linux/fs.h
|
||
|
|
+++ b/include/linux/fs.h
|
||
|
|
@@ -2558,6 +2558,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
|
||
|
|
extern int inode_newsize_ok(const struct inode *, loff_t offset);
|
||
|
|
extern void setattr_copy(struct inode *inode, const struct iattr *attr);
|
||
|
|
|
||
|
|
+extern int update_time(struct inode *, struct timespec *, int);
|
||
|
|
extern int file_update_time(struct file *file);
|
||
|
|
|
||
|
|
extern int generic_show_options(struct seq_file *m, struct dentry *root);
|
||
|
|
diff --git a/include/linux/splice.h b/include/linux/splice.h
|
||
|
|
index 09a545a..1ac5727 100644
|
||
|
|
--- a/include/linux/splice.h
|
||
|
|
+++ b/include/linux/splice.h
|
||
|
|
@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
|
||
|
|
extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
|
||
|
|
|
||
|
|
extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
|
||
|
|
+
|
||
|
|
+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
|