[packages/kernel] - up to 5.9.1 - updated aufs5 patch

baggins baggins at pld-linux.org
Mon Oct 19 15:49:29 CEST 2020


commit 6803432e1ddfe0d8290cfc3e5e8a71d52dc8a993
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Oct 19 15:48:55 2020 +0200

    - up to 5.9.1
    - updated aufs5 patch

 kernel-aufs5.patch | 8 ++++----
 kernel.spec        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ffb4d6a1..43a30d6c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define		rel		0.1
 %define		basever		5.9
-%define		postver		.0
+%define		postver		.1
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -127,7 +127,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5:	0959d759fd19e146367221aff504ad91
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	1f276bf9d1bc12215179a4681c29a573
+# Patch0-md5:	1740eb78293ff559ccc63556de86d604
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 4d2cdedc..817d2bc1 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -259,9 +259,9 @@ index 45cc10cdf6ddd..916efd7e612b3 100644
  /* /sys/fs */
  extern struct kobject *fs_kobj;
 @@ -2633,6 +2642,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
- 	return false;
  }
- #endif
+ 
+ void emergency_thaw_all(void);
 +extern int __sync_filesystem(struct super_block *, int);
  extern int sync_filesystem(struct super_block *);
  extern const struct file_operations def_blk_fops;
@@ -575,7 +575,7 @@ index f609e9ec4a253..d554b349c653c 100644
 +	vma_get_file(vma);
 +	file = vma->vm_file;
 +	prfile = vma->vm_prfile;
- 	ret = do_mmap_pgoff(vma->vm_file, start, size,
+ 	ret = do_mmap(vma->vm_file, start, size,
  			prot, flags, pgoff, &populate, NULL);
 +	if (!IS_ERR_VALUE(ret) && file && prfile) {
 +		struct vm_area_struct *new_vma;
@@ -16959,8 +16959,8 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +}
 +
 +static int au_hfsn_handle_event(struct fsnotify_group *group,
-+				struct inode *inode,
 +				u32 mask, const void *data, int data_type,
++				struct inode *inode,
 +				const struct qstr *file_name, u32 cookie,
 +				struct fsnotify_iter_info *iter_info)
 +{
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6803432e1ddfe0d8290cfc3e5e8a71d52dc8a993



More information about the pld-cvs-commit mailing list