Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel aufs.ğatch

Browse Source
This commit is contained in:
Rmys
2022-05-04 23:16:24 +03:00
parent 0e9bdc8903
commit 9d0f40caab
4 changed files with 13740 additions and 13650 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/kernel/files/patches/mageia/fs-aufs5.15-symbol-exports.patch
+60 -72
View File
@@ -8,17 +8,16 @@
fs/open.c | 1 + fs/open.c | 1 +
fs/read_write.c | 2 ++ fs/read_write.c | 2 ++
fs/splice.c | 2 ++ fs/splice.c | 2 ++
fs/sync.c | 1 +
fs/xattr.c | 1 + fs/xattr.c | 1 +
kernel/locking/lockdep.c | 1 + kernel/locking/lockdep.c | 1 +
kernel/task_work.c | 1 + kernel/task_work.c | 1 +
security/security.c | 8 ++++++++ security/security.c | 8 ++++++++
14 files changed, 27 insertions(+) 13 files changed, 26 insertions(+)
diff -Nurp linux-5.15.1-aufs/fs/dcache.c linux-5.15.1-aufs-mod/fs/dcache.c diff -Nurp linux-5.15.37-aufs/fs/dcache.c linux-5.15.37-aufs-mod/fs/dcache.c
--- linux-5.15.1-aufs/fs/dcache.c 2021-11-08 23:01:48.275645778 +0200 --- linux-5.15.37-aufs/fs/dcache.c 2022-04-08 20:22:30.617616719 +0300
+++ linux-5.15.1-aufs-mod/fs/dcache.c 2021-11-08 23:02:45.270309130 +0200 +++ linux-5.15.37-aufs-mod/fs/dcache.c 2022-04-08 20:24:23.624148779 +0300
@@ -1425,6 +1425,7 @@ rename_retry: @@ -1450,6 +1450,7 @@ rename_retry:
seq = 1; seq = 1;
goto again; goto again;
} }
@@ -26,7 +25,7 @@ diff -Nurp linux-5.15.1-aufs/fs/dcache.c linux-5.15.1-aufs-mod/fs/dcache.c
struct check_mount { struct check_mount {
struct vfsmount *mnt; struct vfsmount *mnt;
@@ -2970,6 +2971,7 @@ void d_exchange(struct dentry *dentry1, @@ -2995,6 +2996,7 @@ void d_exchange(struct dentry *dentry1,
write_sequnlock(&rename_lock); write_sequnlock(&rename_lock);
} }
@@ -34,10 +33,10 @@ diff -Nurp linux-5.15.1-aufs/fs/dcache.c linux-5.15.1-aufs-mod/fs/dcache.c
/** /**
* d_ancestor - search for an ancestor * d_ancestor - search for an ancestor
diff -Nurp linux-5.15.1-aufs/fs/exec.c linux-5.15.1-aufs-mod/fs/exec.c diff -Nurp linux-5.15.37-aufs/fs/exec.c linux-5.15.37-aufs-mod/fs/exec.c
--- linux-5.15.1-aufs/fs/exec.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/exec.c 2022-04-08 20:07:30.690498863 +0300
+++ linux-5.15.1-aufs-mod/fs/exec.c 2021-11-08 23:02:45.270309130 +0200 +++ linux-5.15.37-aufs-mod/fs/exec.c 2022-04-08 20:24:23.624148779 +0300
@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path @@ -112,6 +112,7 @@ bool path_noexec(const struct path *path
return (path->mnt->mnt_flags & MNT_NOEXEC) || return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC); (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
} }
@@ -45,9 +44,9 @@ diff -Nurp linux-5.15.1-aufs/fs/exec.c linux-5.15.1-aufs-mod/fs/exec.c
#ifdef CONFIG_USELIB #ifdef CONFIG_USELIB
/* /*
diff -Nurp linux-5.15.1-aufs/fs/fcntl.c linux-5.15.1-aufs-mod/fs/fcntl.c diff -Nurp linux-5.15.37-aufs/fs/fcntl.c linux-5.15.37-aufs-mod/fs/fcntl.c
--- linux-5.15.1-aufs/fs/fcntl.c 2021-11-08 23:01:48.275645778 +0200 --- linux-5.15.37-aufs/fs/fcntl.c 2022-04-08 20:22:30.617616719 +0300
+++ linux-5.15.1-aufs-mod/fs/fcntl.c 2021-11-08 23:02:45.270309130 +0200 +++ linux-5.15.37-aufs-mod/fs/fcntl.c 2022-04-08 20:24:23.624148779 +0300
@@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, uns @@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, uns
out: out:
return error; return error;
@@ -56,10 +55,10 @@ diff -Nurp linux-5.15.1-aufs/fs/fcntl.c linux-5.15.1-aufs-mod/fs/fcntl.c
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force) int force)
diff -Nurp linux-5.15.1-aufs/fs/file_table.c linux-5.15.1-aufs-mod/fs/file_table.c diff -Nurp linux-5.15.37-aufs/fs/file_table.c linux-5.15.37-aufs-mod/fs/file_table.c
--- linux-5.15.1-aufs/fs/file_table.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/file_table.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/file_table.c 2021-11-08 23:02:45.270309130 +0200 +++ linux-5.15.37-aufs-mod/fs/file_table.c 2022-04-08 20:24:23.624148779 +0300
@@ -161,6 +161,7 @@ over: @@ -198,6 +198,7 @@ over:
} }
return ERR_PTR(-ENFILE); return ERR_PTR(-ENFILE);
} }
@@ -67,7 +66,7 @@ diff -Nurp linux-5.15.1-aufs/fs/file_table.c linux-5.15.1-aufs-mod/fs/file_table
/* /*
* Variant of alloc_empty_file() that doesn't check and modify nr_files. * Variant of alloc_empty_file() that doesn't check and modify nr_files.
@@ -375,6 +376,7 @@ void __fput_sync(struct file *file) @@ -412,6 +413,7 @@ void __fput_sync(struct file *file)
} }
EXPORT_SYMBOL(fput); EXPORT_SYMBOL(fput);
@@ -75,10 +74,10 @@ diff -Nurp linux-5.15.1-aufs/fs/file_table.c linux-5.15.1-aufs-mod/fs/file_table
void __init files_init(void) void __init files_init(void)
{ {
diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c diff -Nurp linux-5.15.37-aufs/fs/namespace.c linux-5.15.37-aufs-mod/fs/namespace.c
--- linux-5.15.1-aufs/fs/namespace.c 2021-11-08 23:01:48.276645825 +0200 --- linux-5.15.37-aufs/fs/namespace.c 2022-04-08 20:22:30.617616719 +0300
+++ linux-5.15.1-aufs-mod/fs/namespace.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/namespace.c 2022-04-08 20:24:23.624148779 +0300
@@ -439,6 +439,7 @@ void __mnt_drop_write(struct vfsmount *m @@ -440,6 +440,7 @@ void __mnt_drop_write(struct vfsmount *m
mnt_dec_writers(real_mount(mnt)); mnt_dec_writers(real_mount(mnt));
preempt_enable(); preempt_enable();
} }
@@ -86,7 +85,7 @@ diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c
/** /**
* mnt_drop_write - give up write access to a mount * mnt_drop_write - give up write access to a mount
@@ -813,6 +814,7 @@ int is_current_mnt_ns(struct vfsmount *m @@ -844,6 +845,7 @@ int is_current_mnt_ns(struct vfsmount *m
{ {
return check_mnt(real_mount(mnt)); return check_mnt(real_mount(mnt));
} }
@@ -94,7 +93,7 @@ diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c
/* /*
* vfsmount lock must be held for write * vfsmount lock must be held for write
@@ -2011,6 +2013,7 @@ int iterate_mounts(int (*f)(struct vfsmo @@ -2047,6 +2049,7 @@ int iterate_mounts(int (*f)(struct vfsmo
} }
return 0; return 0;
} }
@@ -102,9 +101,9 @@ diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c
static void lock_mnt_tree(struct mount *mnt) static void lock_mnt_tree(struct mount *mnt)
{ {
diff -Nurp linux-5.15.1-aufs/fs/notify/group.c linux-5.15.1-aufs-mod/fs/notify/group.c diff -Nurp linux-5.15.37-aufs/fs/notify/group.c linux-5.15.37-aufs-mod/fs/notify/group.c
--- linux-5.15.1-aufs/fs/notify/group.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/notify/group.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/notify/group.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/notify/group.c 2022-04-08 20:24:23.624148779 +0300
@@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_ @@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_
{ {
refcount_inc(&group->refcnt); refcount_inc(&group->refcnt);
@@ -113,10 +112,10 @@ diff -Nurp linux-5.15.1-aufs/fs/notify/group.c linux-5.15.1-aufs-mod/fs/notify/g
/* /*
* Drop a reference to a group. Free it if it's through. * Drop a reference to a group. Free it if it's through.
diff -Nurp linux-5.15.1-aufs/fs/open.c linux-5.15.1-aufs-mod/fs/open.c diff -Nurp linux-5.15.37-aufs/fs/open.c linux-5.15.37-aufs-mod/fs/open.c
--- linux-5.15.1-aufs/fs/open.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/open.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/open.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/open.c 2022-04-08 20:24:23.625148828 +0300
@@ -65,6 +65,7 @@ int do_truncate(struct user_namespace *m @@ -66,6 +66,7 @@ int do_truncate(struct user_namespace *m
inode_unlock(dentry->d_inode); inode_unlock(dentry->d_inode);
return ret; return ret;
} }
@@ -124,10 +123,10 @@ diff -Nurp linux-5.15.1-aufs/fs/open.c linux-5.15.1-aufs-mod/fs/open.c
long vfs_truncate(const struct path *path, loff_t length) long vfs_truncate(const struct path *path, loff_t length)
{ {
diff -Nurp linux-5.15.1-aufs/fs/read_write.c linux-5.15.1-aufs-mod/fs/read_write.c diff -Nurp linux-5.15.37-aufs/fs/read_write.c linux-5.15.37-aufs-mod/fs/read_write.c
--- linux-5.15.1-aufs/fs/read_write.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/read_write.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/read_write.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/read_write.c 2022-04-08 20:24:23.625148828 +0300
@@ -492,6 +492,7 @@ ssize_t vfs_read(struct file *file, char @@ -488,6 +488,7 @@ ssize_t vfs_read(struct file *file, char
inc_syscr(current); inc_syscr(current);
return ret; return ret;
} }
@@ -135,7 +134,7 @@ diff -Nurp linux-5.15.1-aufs/fs/read_write.c linux-5.15.1-aufs-mod/fs/read_write
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos) static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
{ {
@@ -602,6 +603,7 @@ ssize_t vfs_write(struct file *file, con @@ -598,6 +599,7 @@ ssize_t vfs_write(struct file *file, con
file_end_write(file); file_end_write(file);
return ret; return ret;
} }
@@ -143,9 +142,9 @@ diff -Nurp linux-5.15.1-aufs/fs/read_write.c linux-5.15.1-aufs-mod/fs/read_write
/* file_ppos returns &file->f_pos or NULL if file is stream */ /* file_ppos returns &file->f_pos or NULL if file is stream */
static inline loff_t *file_ppos(struct file *file) static inline loff_t *file_ppos(struct file *file)
diff -Nurp linux-5.15.1-aufs/fs/splice.c linux-5.15.1-aufs-mod/fs/splice.c diff -Nurp linux-5.15.37-aufs/fs/splice.c linux-5.15.37-aufs-mod/fs/splice.c
--- linux-5.15.1-aufs/fs/splice.c 2021-11-08 23:01:48.276645825 +0200 --- linux-5.15.37-aufs/fs/splice.c 2022-04-08 20:22:30.617616719 +0300
+++ linux-5.15.1-aufs-mod/fs/splice.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/splice.c 2022-04-08 20:24:23.625148828 +0300
@@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_in @@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_in
return warn_unsupported(out, "write"); return warn_unsupported(out, "write");
return out->f_op->splice_write(pipe, out, ppos, len, flags); return out->f_op->splice_write(pipe, out, ppos, len, flags);
@@ -162,20 +161,9 @@ diff -Nurp linux-5.15.1-aufs/fs/splice.c linux-5.15.1-aufs-mod/fs/splice.c
/** /**
* splice_direct_to_actor - splices data directly between two non-pipes * splice_direct_to_actor - splices data directly between two non-pipes
diff -Nurp linux-5.15.1-aufs/fs/sync.c linux-5.15.1-aufs-mod/fs/sync.c diff -Nurp linux-5.15.37-aufs/fs/xattr.c linux-5.15.37-aufs-mod/fs/xattr.c
--- linux-5.15.1-aufs/fs/sync.c 2021-11-08 23:01:48.276645825 +0200 --- linux-5.15.37-aufs/fs/xattr.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/sync.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/xattr.c 2022-04-08 20:24:23.625148828 +0300
@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block
sb->s_op->sync_fs(sb, wait);
return __sync_blockdev(sb->s_bdev, wait);
}
+EXPORT_SYMBOL_GPL(__sync_filesystem);
/*
* Write out and wait upon all dirty data associated with this
diff -Nurp linux-5.15.1-aufs/fs/xattr.c linux-5.15.1-aufs-mod/fs/xattr.c
--- linux-5.15.1-aufs/fs/xattr.c 2021-10-31 22:53:10.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/xattr.c 2021-11-08 23:02:45.271309177 +0200
@@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace @@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace
*xattr_value = value; *xattr_value = value;
return error; return error;
@@ -184,10 +172,10 @@ diff -Nurp linux-5.15.1-aufs/fs/xattr.c linux-5.15.1-aufs-mod/fs/xattr.c
ssize_t ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff -Nurp linux-5.15.1-aufs/kernel/locking/lockdep.c linux-5.15.1-aufs-mod/kernel/locking/lockdep.c diff -Nurp linux-5.15.37-aufs/kernel/locking/lockdep.c linux-5.15.37-aufs-mod/kernel/locking/lockdep.c
--- linux-5.15.1-aufs/kernel/locking/lockdep.c 2021-11-08 23:01:48.277645871 +0200 --- linux-5.15.37-aufs/kernel/locking/lockdep.c 2022-04-08 20:22:30.619616817 +0300
+++ linux-5.15.1-aufs-mod/kernel/locking/lockdep.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/kernel/locking/lockdep.c 2022-04-08 20:24:23.625148828 +0300
@@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_ @@ -208,6 +208,7 @@ inline struct lock_class *lockdep_hlock_
*/ */
return lock_classes + class_idx; return lock_classes + class_idx;
} }
@@ -195,18 +183,18 @@ diff -Nurp linux-5.15.1-aufs/kernel/locking/lockdep.c linux-5.15.1-aufs-mod/kern
#define hlock_class(hlock) lockdep_hlock_class(hlock) #define hlock_class(hlock) lockdep_hlock_class(hlock)
#ifdef CONFIG_LOCK_STAT #ifdef CONFIG_LOCK_STAT
diff -Nurp linux-5.15.1-aufs/kernel/task_work.c linux-5.15.1-aufs-mod/kernel/task_work.c diff -Nurp linux-5.15.37-aufs/kernel/task_work.c linux-5.15.37-aufs-mod/kernel/task_work.c
--- linux-5.15.1-aufs/kernel/task_work.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/kernel/task_work.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/kernel/task_work.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/kernel/task_work.c 2022-04-08 20:24:23.625148828 +0300
@@ -167,3 +167,4 @@ void task_work_run(void) @@ -167,3 +167,4 @@ void task_work_run(void)
} while (work); } while (work);
} }
} }
+EXPORT_SYMBOL_GPL(task_work_run); +EXPORT_SYMBOL_GPL(task_work_run);
diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/security.c diff -Nurp linux-5.15.37-aufs/security/security.c linux-5.15.37-aufs-mod/security/security.c
--- linux-5.15.1-aufs/security/security.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/security/security.c 2022-04-08 20:07:30.718500239 +0300
+++ linux-5.15.1-aufs-mod/security/security.c 2021-11-08 23:02:45.272309224 +0200 +++ linux-5.15.37-aufs-mod/security/security.c 2022-04-08 20:24:23.626148877 +0300
@@ -1147,6 +1147,7 @@ int security_path_rmdir(const struct pat @@ -1164,6 +1164,7 @@ int security_path_rmdir(const struct pat
return 0; return 0;
return call_int_hook(path_rmdir, 0, dir, dentry); return call_int_hook(path_rmdir, 0, dir, dentry);
} }
@@ -214,7 +202,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_unlink(const struct path *dir, struct dentry *dentry) int security_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
@@ -1163,6 +1164,7 @@ int security_path_symlink(const struct p @@ -1180,6 +1181,7 @@ int security_path_symlink(const struct p
return 0; return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name); return call_int_hook(path_symlink, 0, dir, dentry, old_name);
} }
@@ -222,7 +210,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_link(struct dentry *old_dentry, const struct path *new_dir, int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry) struct dentry *new_dentry)
@@ -1171,6 +1173,7 @@ int security_path_link(struct dentry *ol @@ -1188,6 +1190,7 @@ int security_path_link(struct dentry *ol
return 0; return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry); return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
} }
@@ -230,7 +218,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry, const struct path *new_dir, struct dentry *new_dentry,
@@ -1198,6 +1201,7 @@ int security_path_truncate(const struct @@ -1215,6 +1218,7 @@ int security_path_truncate(const struct
return 0; return 0;
return call_int_hook(path_truncate, 0, path); return call_int_hook(path_truncate, 0, path);
} }
@@ -238,7 +226,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_chmod(const struct path *path, umode_t mode) int security_path_chmod(const struct path *path, umode_t mode)
{ {
@@ -1205,6 +1209,7 @@ int security_path_chmod(const struct pat @@ -1222,6 +1226,7 @@ int security_path_chmod(const struct pat
return 0; return 0;
return call_int_hook(path_chmod, 0, path, mode); return call_int_hook(path_chmod, 0, path, mode);
} }
@@ -246,7 +234,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{ {
@@ -1212,6 +1217,7 @@ int security_path_chown(const struct pat @@ -1229,6 +1234,7 @@ int security_path_chown(const struct pat
return 0; return 0;
return call_int_hook(path_chown, 0, path, uid, gid); return call_int_hook(path_chown, 0, path, uid, gid);
} }
@@ -254,7 +242,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_chroot(const struct path *path) int security_path_chroot(const struct path *path)
{ {
@@ -1312,6 +1318,7 @@ int security_inode_permission(struct ino @@ -1329,6 +1335,7 @@ int security_inode_permission(struct ino
return 0; return 0;
return call_int_hook(inode_permission, 0, inode, mask); return call_int_hook(inode_permission, 0, inode, mask);
} }
@@ -262,7 +250,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{ {
@@ -1509,6 +1516,7 @@ int security_file_permission(struct file @@ -1526,6 +1533,7 @@ int security_file_permission(struct file
return fsnotify_perm(file, mask); return fsnotify_perm(file, mask);
} }
kernel/kernel/files/patches/mageia/fs-aufs5.15.patch
+6810 -6753
View File
File diff suppressed because it is too large Load Diff
kernel/tools/cpupowertools/files/patches/mageia/fs-aufs5.15-symbol-exports.patch
+60 -72
View File
@@ -8,17 +8,16 @@
fs/open.c | 1 + fs/open.c | 1 +
fs/read_write.c | 2 ++ fs/read_write.c | 2 ++
fs/splice.c | 2 ++ fs/splice.c | 2 ++
fs/sync.c | 1 +
fs/xattr.c | 1 + fs/xattr.c | 1 +
kernel/locking/lockdep.c | 1 + kernel/locking/lockdep.c | 1 +
kernel/task_work.c | 1 + kernel/task_work.c | 1 +
security/security.c | 8 ++++++++ security/security.c | 8 ++++++++
14 files changed, 27 insertions(+) 13 files changed, 26 insertions(+)
diff -Nurp linux-5.15.1-aufs/fs/dcache.c linux-5.15.1-aufs-mod/fs/dcache.c diff -Nurp linux-5.15.37-aufs/fs/dcache.c linux-5.15.37-aufs-mod/fs/dcache.c
--- linux-5.15.1-aufs/fs/dcache.c 2021-11-08 23:01:48.275645778 +0200 --- linux-5.15.37-aufs/fs/dcache.c 2022-04-08 20:22:30.617616719 +0300
+++ linux-5.15.1-aufs-mod/fs/dcache.c 2021-11-08 23:02:45.270309130 +0200 +++ linux-5.15.37-aufs-mod/fs/dcache.c 2022-04-08 20:24:23.624148779 +0300
@@ -1425,6 +1425,7 @@ rename_retry: @@ -1450,6 +1450,7 @@ rename_retry:
seq = 1; seq = 1;
goto again; goto again;
} }
@@ -26,7 +25,7 @@ diff -Nurp linux-5.15.1-aufs/fs/dcache.c linux-5.15.1-aufs-mod/fs/dcache.c
struct check_mount { struct check_mount {
struct vfsmount *mnt; struct vfsmount *mnt;
@@ -2970,6 +2971,7 @@ void d_exchange(struct dentry *dentry1, @@ -2995,6 +2996,7 @@ void d_exchange(struct dentry *dentry1,
write_sequnlock(&rename_lock); write_sequnlock(&rename_lock);
} }
@@ -34,10 +33,10 @@ diff -Nurp linux-5.15.1-aufs/fs/dcache.c linux-5.15.1-aufs-mod/fs/dcache.c
/** /**
* d_ancestor - search for an ancestor * d_ancestor - search for an ancestor
diff -Nurp linux-5.15.1-aufs/fs/exec.c linux-5.15.1-aufs-mod/fs/exec.c diff -Nurp linux-5.15.37-aufs/fs/exec.c linux-5.15.37-aufs-mod/fs/exec.c
--- linux-5.15.1-aufs/fs/exec.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/exec.c 2022-04-08 20:07:30.690498863 +0300
+++ linux-5.15.1-aufs-mod/fs/exec.c 2021-11-08 23:02:45.270309130 +0200 +++ linux-5.15.37-aufs-mod/fs/exec.c 2022-04-08 20:24:23.624148779 +0300
@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path @@ -112,6 +112,7 @@ bool path_noexec(const struct path *path
return (path->mnt->mnt_flags & MNT_NOEXEC) || return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC); (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
} }
@@ -45,9 +44,9 @@ diff -Nurp linux-5.15.1-aufs/fs/exec.c linux-5.15.1-aufs-mod/fs/exec.c
#ifdef CONFIG_USELIB #ifdef CONFIG_USELIB
/* /*
diff -Nurp linux-5.15.1-aufs/fs/fcntl.c linux-5.15.1-aufs-mod/fs/fcntl.c diff -Nurp linux-5.15.37-aufs/fs/fcntl.c linux-5.15.37-aufs-mod/fs/fcntl.c
--- linux-5.15.1-aufs/fs/fcntl.c 2021-11-08 23:01:48.275645778 +0200 --- linux-5.15.37-aufs/fs/fcntl.c 2022-04-08 20:22:30.617616719 +0300
+++ linux-5.15.1-aufs-mod/fs/fcntl.c 2021-11-08 23:02:45.270309130 +0200 +++ linux-5.15.37-aufs-mod/fs/fcntl.c 2022-04-08 20:24:23.624148779 +0300
@@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, uns @@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, uns
out: out:
return error; return error;
@@ -56,10 +55,10 @@ diff -Nurp linux-5.15.1-aufs/fs/fcntl.c linux-5.15.1-aufs-mod/fs/fcntl.c
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force) int force)
diff -Nurp linux-5.15.1-aufs/fs/file_table.c linux-5.15.1-aufs-mod/fs/file_table.c diff -Nurp linux-5.15.37-aufs/fs/file_table.c linux-5.15.37-aufs-mod/fs/file_table.c
--- linux-5.15.1-aufs/fs/file_table.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/file_table.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/file_table.c 2021-11-08 23:02:45.270309130 +0200 +++ linux-5.15.37-aufs-mod/fs/file_table.c 2022-04-08 20:24:23.624148779 +0300
@@ -161,6 +161,7 @@ over: @@ -198,6 +198,7 @@ over:
} }
return ERR_PTR(-ENFILE); return ERR_PTR(-ENFILE);
} }
@@ -67,7 +66,7 @@ diff -Nurp linux-5.15.1-aufs/fs/file_table.c linux-5.15.1-aufs-mod/fs/file_table
/* /*
* Variant of alloc_empty_file() that doesn't check and modify nr_files. * Variant of alloc_empty_file() that doesn't check and modify nr_files.
@@ -375,6 +376,7 @@ void __fput_sync(struct file *file) @@ -412,6 +413,7 @@ void __fput_sync(struct file *file)
} }
EXPORT_SYMBOL(fput); EXPORT_SYMBOL(fput);
@@ -75,10 +74,10 @@ diff -Nurp linux-5.15.1-aufs/fs/file_table.c linux-5.15.1-aufs-mod/fs/file_table
void __init files_init(void) void __init files_init(void)
{ {
diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c diff -Nurp linux-5.15.37-aufs/fs/namespace.c linux-5.15.37-aufs-mod/fs/namespace.c
--- linux-5.15.1-aufs/fs/namespace.c 2021-11-08 23:01:48.276645825 +0200 --- linux-5.15.37-aufs/fs/namespace.c 2022-04-08 20:22:30.617616719 +0300
+++ linux-5.15.1-aufs-mod/fs/namespace.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/namespace.c 2022-04-08 20:24:23.624148779 +0300
@@ -439,6 +439,7 @@ void __mnt_drop_write(struct vfsmount *m @@ -440,6 +440,7 @@ void __mnt_drop_write(struct vfsmount *m
mnt_dec_writers(real_mount(mnt)); mnt_dec_writers(real_mount(mnt));
preempt_enable(); preempt_enable();
} }
@@ -86,7 +85,7 @@ diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c
/** /**
* mnt_drop_write - give up write access to a mount * mnt_drop_write - give up write access to a mount
@@ -813,6 +814,7 @@ int is_current_mnt_ns(struct vfsmount *m @@ -844,6 +845,7 @@ int is_current_mnt_ns(struct vfsmount *m
{ {
return check_mnt(real_mount(mnt)); return check_mnt(real_mount(mnt));
} }
@@ -94,7 +93,7 @@ diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c
/* /*
* vfsmount lock must be held for write * vfsmount lock must be held for write
@@ -2011,6 +2013,7 @@ int iterate_mounts(int (*f)(struct vfsmo @@ -2047,6 +2049,7 @@ int iterate_mounts(int (*f)(struct vfsmo
} }
return 0; return 0;
} }
@@ -102,9 +101,9 @@ diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c
static void lock_mnt_tree(struct mount *mnt) static void lock_mnt_tree(struct mount *mnt)
{ {
diff -Nurp linux-5.15.1-aufs/fs/notify/group.c linux-5.15.1-aufs-mod/fs/notify/group.c diff -Nurp linux-5.15.37-aufs/fs/notify/group.c linux-5.15.37-aufs-mod/fs/notify/group.c
--- linux-5.15.1-aufs/fs/notify/group.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/notify/group.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/notify/group.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/notify/group.c 2022-04-08 20:24:23.624148779 +0300
@@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_ @@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_
{ {
refcount_inc(&group->refcnt); refcount_inc(&group->refcnt);
@@ -113,10 +112,10 @@ diff -Nurp linux-5.15.1-aufs/fs/notify/group.c linux-5.15.1-aufs-mod/fs/notify/g
/* /*
* Drop a reference to a group. Free it if it's through. * Drop a reference to a group. Free it if it's through.
diff -Nurp linux-5.15.1-aufs/fs/open.c linux-5.15.1-aufs-mod/fs/open.c diff -Nurp linux-5.15.37-aufs/fs/open.c linux-5.15.37-aufs-mod/fs/open.c
--- linux-5.15.1-aufs/fs/open.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/open.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/open.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/open.c 2022-04-08 20:24:23.625148828 +0300
@@ -65,6 +65,7 @@ int do_truncate(struct user_namespace *m @@ -66,6 +66,7 @@ int do_truncate(struct user_namespace *m
inode_unlock(dentry->d_inode); inode_unlock(dentry->d_inode);
return ret; return ret;
} }
@@ -124,10 +123,10 @@ diff -Nurp linux-5.15.1-aufs/fs/open.c linux-5.15.1-aufs-mod/fs/open.c
long vfs_truncate(const struct path *path, loff_t length) long vfs_truncate(const struct path *path, loff_t length)
{ {
diff -Nurp linux-5.15.1-aufs/fs/read_write.c linux-5.15.1-aufs-mod/fs/read_write.c diff -Nurp linux-5.15.37-aufs/fs/read_write.c linux-5.15.37-aufs-mod/fs/read_write.c
--- linux-5.15.1-aufs/fs/read_write.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/fs/read_write.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/read_write.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/read_write.c 2022-04-08 20:24:23.625148828 +0300
@@ -492,6 +492,7 @@ ssize_t vfs_read(struct file *file, char @@ -488,6 +488,7 @@ ssize_t vfs_read(struct file *file, char
inc_syscr(current); inc_syscr(current);
return ret; return ret;
} }
@@ -135,7 +134,7 @@ diff -Nurp linux-5.15.1-aufs/fs/read_write.c linux-5.15.1-aufs-mod/fs/read_write
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos) static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
{ {
@@ -602,6 +603,7 @@ ssize_t vfs_write(struct file *file, con @@ -598,6 +599,7 @@ ssize_t vfs_write(struct file *file, con
file_end_write(file); file_end_write(file);
return ret; return ret;
} }
@@ -143,9 +142,9 @@ diff -Nurp linux-5.15.1-aufs/fs/read_write.c linux-5.15.1-aufs-mod/fs/read_write
/* file_ppos returns &file->f_pos or NULL if file is stream */ /* file_ppos returns &file->f_pos or NULL if file is stream */
static inline loff_t *file_ppos(struct file *file) static inline loff_t *file_ppos(struct file *file)
diff -Nurp linux-5.15.1-aufs/fs/splice.c linux-5.15.1-aufs-mod/fs/splice.c diff -Nurp linux-5.15.37-aufs/fs/splice.c linux-5.15.37-aufs-mod/fs/splice.c
--- linux-5.15.1-aufs/fs/splice.c 2021-11-08 23:01:48.276645825 +0200 --- linux-5.15.37-aufs/fs/splice.c 2022-04-08 20:22:30.617616719 +0300
+++ linux-5.15.1-aufs-mod/fs/splice.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/splice.c 2022-04-08 20:24:23.625148828 +0300
@@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_in @@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_in
return warn_unsupported(out, "write"); return warn_unsupported(out, "write");
return out->f_op->splice_write(pipe, out, ppos, len, flags); return out->f_op->splice_write(pipe, out, ppos, len, flags);
@@ -162,20 +161,9 @@ diff -Nurp linux-5.15.1-aufs/fs/splice.c linux-5.15.1-aufs-mod/fs/splice.c
/** /**
* splice_direct_to_actor - splices data directly between two non-pipes * splice_direct_to_actor - splices data directly between two non-pipes
diff -Nurp linux-5.15.1-aufs/fs/sync.c linux-5.15.1-aufs-mod/fs/sync.c diff -Nurp linux-5.15.37-aufs/fs/xattr.c linux-5.15.37-aufs-mod/fs/xattr.c
--- linux-5.15.1-aufs/fs/sync.c 2021-11-08 23:01:48.276645825 +0200 --- linux-5.15.37-aufs/fs/xattr.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/sync.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/fs/xattr.c 2022-04-08 20:24:23.625148828 +0300
@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block
sb->s_op->sync_fs(sb, wait);
return __sync_blockdev(sb->s_bdev, wait);
}
+EXPORT_SYMBOL_GPL(__sync_filesystem);
/*
* Write out and wait upon all dirty data associated with this
diff -Nurp linux-5.15.1-aufs/fs/xattr.c linux-5.15.1-aufs-mod/fs/xattr.c
--- linux-5.15.1-aufs/fs/xattr.c 2021-10-31 22:53:10.000000000 +0200
+++ linux-5.15.1-aufs-mod/fs/xattr.c 2021-11-08 23:02:45.271309177 +0200
@@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace @@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace
*xattr_value = value; *xattr_value = value;
return error; return error;
@@ -184,10 +172,10 @@ diff -Nurp linux-5.15.1-aufs/fs/xattr.c linux-5.15.1-aufs-mod/fs/xattr.c
ssize_t ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff -Nurp linux-5.15.1-aufs/kernel/locking/lockdep.c linux-5.15.1-aufs-mod/kernel/locking/lockdep.c diff -Nurp linux-5.15.37-aufs/kernel/locking/lockdep.c linux-5.15.37-aufs-mod/kernel/locking/lockdep.c
--- linux-5.15.1-aufs/kernel/locking/lockdep.c 2021-11-08 23:01:48.277645871 +0200 --- linux-5.15.37-aufs/kernel/locking/lockdep.c 2022-04-08 20:22:30.619616817 +0300
+++ linux-5.15.1-aufs-mod/kernel/locking/lockdep.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/kernel/locking/lockdep.c 2022-04-08 20:24:23.625148828 +0300
@@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_ @@ -208,6 +208,7 @@ inline struct lock_class *lockdep_hlock_
*/ */
return lock_classes + class_idx; return lock_classes + class_idx;
} }
@@ -195,18 +183,18 @@ diff -Nurp linux-5.15.1-aufs/kernel/locking/lockdep.c linux-5.15.1-aufs-mod/kern
#define hlock_class(hlock) lockdep_hlock_class(hlock) #define hlock_class(hlock) lockdep_hlock_class(hlock)
#ifdef CONFIG_LOCK_STAT #ifdef CONFIG_LOCK_STAT
diff -Nurp linux-5.15.1-aufs/kernel/task_work.c linux-5.15.1-aufs-mod/kernel/task_work.c diff -Nurp linux-5.15.37-aufs/kernel/task_work.c linux-5.15.37-aufs-mod/kernel/task_work.c
--- linux-5.15.1-aufs/kernel/task_work.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/kernel/task_work.c 2022-03-20 22:14:17.000000000 +0200
+++ linux-5.15.1-aufs-mod/kernel/task_work.c 2021-11-08 23:02:45.271309177 +0200 +++ linux-5.15.37-aufs-mod/kernel/task_work.c 2022-04-08 20:24:23.625148828 +0300
@@ -167,3 +167,4 @@ void task_work_run(void) @@ -167,3 +167,4 @@ void task_work_run(void)
} while (work); } while (work);
} }
} }
+EXPORT_SYMBOL_GPL(task_work_run); +EXPORT_SYMBOL_GPL(task_work_run);
diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/security.c diff -Nurp linux-5.15.37-aufs/security/security.c linux-5.15.37-aufs-mod/security/security.c
--- linux-5.15.1-aufs/security/security.c 2021-10-31 22:53:10.000000000 +0200 --- linux-5.15.37-aufs/security/security.c 2022-04-08 20:07:30.718500239 +0300
+++ linux-5.15.1-aufs-mod/security/security.c 2021-11-08 23:02:45.272309224 +0200 +++ linux-5.15.37-aufs-mod/security/security.c 2022-04-08 20:24:23.626148877 +0300
@@ -1147,6 +1147,7 @@ int security_path_rmdir(const struct pat @@ -1164,6 +1164,7 @@ int security_path_rmdir(const struct pat
return 0; return 0;
return call_int_hook(path_rmdir, 0, dir, dentry); return call_int_hook(path_rmdir, 0, dir, dentry);
} }
@@ -214,7 +202,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_unlink(const struct path *dir, struct dentry *dentry) int security_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
@@ -1163,6 +1164,7 @@ int security_path_symlink(const struct p @@ -1180,6 +1181,7 @@ int security_path_symlink(const struct p
return 0; return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name); return call_int_hook(path_symlink, 0, dir, dentry, old_name);
} }
@@ -222,7 +210,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_link(struct dentry *old_dentry, const struct path *new_dir, int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry) struct dentry *new_dentry)
@@ -1171,6 +1173,7 @@ int security_path_link(struct dentry *ol @@ -1188,6 +1190,7 @@ int security_path_link(struct dentry *ol
return 0; return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry); return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
} }
@@ -230,7 +218,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry, const struct path *new_dir, struct dentry *new_dentry,
@@ -1198,6 +1201,7 @@ int security_path_truncate(const struct @@ -1215,6 +1218,7 @@ int security_path_truncate(const struct
return 0; return 0;
return call_int_hook(path_truncate, 0, path); return call_int_hook(path_truncate, 0, path);
} }
@@ -238,7 +226,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_chmod(const struct path *path, umode_t mode) int security_path_chmod(const struct path *path, umode_t mode)
{ {
@@ -1205,6 +1209,7 @@ int security_path_chmod(const struct pat @@ -1222,6 +1226,7 @@ int security_path_chmod(const struct pat
return 0; return 0;
return call_int_hook(path_chmod, 0, path, mode); return call_int_hook(path_chmod, 0, path, mode);
} }
@@ -246,7 +234,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{ {
@@ -1212,6 +1217,7 @@ int security_path_chown(const struct pat @@ -1229,6 +1234,7 @@ int security_path_chown(const struct pat
return 0; return 0;
return call_int_hook(path_chown, 0, path, uid, gid); return call_int_hook(path_chown, 0, path, uid, gid);
} }
@@ -254,7 +242,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_path_chroot(const struct path *path) int security_path_chroot(const struct path *path)
{ {
@@ -1312,6 +1318,7 @@ int security_inode_permission(struct ino @@ -1329,6 +1335,7 @@ int security_inode_permission(struct ino
return 0; return 0;
return call_int_hook(inode_permission, 0, inode, mask); return call_int_hook(inode_permission, 0, inode, mask);
} }
@@ -262,7 +250,7 @@ diff -Nurp linux-5.15.1-aufs/security/security.c linux-5.15.1-aufs-mod/security/
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{ {
@@ -1509,6 +1516,7 @@ int security_file_permission(struct file @@ -1526,6 +1533,7 @@ int security_file_permission(struct file
return fsnotify_perm(file, mask); return fsnotify_perm(file, mask);
} }
kernel/tools/cpupowertools/files/patches/mageia/fs-aufs5.15.patch
+6810 -6753
View File
File diff suppressed because it is too large Load Diff