[packages/kernel/LINUX_4_9] - 4.9.197

baggins baggins at pld-linux.org
Fri Oct 18 08:25:29 CEST 2019


commit d12544d8ec642d5d8f2ef771b1109cc2eec26d91
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 18 08:24:19 2019 +0200

    - 4.9.197

 kernel-vserver-2.3.patch | 10 +++++-----
 kernel.spec              |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 3e39a786..cb37c301 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define		rel		1
 %define		basever		4.9
-%define		postver		.196
+%define		postver		.197
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -125,7 +125,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5:	0a68ef3615c64bd5ee54a3320e46667d
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	e03f73af8b9bbc21825cb7892e933420
+# Patch0-md5:	7a3f3aa9bea6fa07bbdbad94518015fd
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index d64b4068..07ea4ba0 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -3604,18 +3604,18 @@ diff -NurpP --minimal linux-4.9.135/fs/libfs.c linux-4.9.135-vs2.3.9.8/fs/libfs.
  	struct dentry *dentry = file->f_path.dentry;
  	struct dentry *cursor = file->private_data;
 @@ -194,9 +195,10 @@ int dcache_readdir(struct file *file, st
- 	if (ctx->pos == 2)
- 		p = &dentry->d_subdirs;
- 	while ((next = next_positive(dentry, p, 1)) != NULL) {
+ 		p = &cursor->d_child;
+ 
+ 	while ((p = scan_positives(cursor, p, 1, &next)) != anchor) {
 -		if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
 +		if (!filter || filter(next))
 +			if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
  			      d_inode(next)->i_ino, dt_type(d_inode(next))))
 -			break;
 +				break;
- 		moved = true;
- 		p = &next->d_child;
  		ctx->pos++;
+ 	}
+ 	spin_lock(&dentry->d_lock);
 @@ -205,8 +207,22 @@ int dcache_readdir(struct file *file, st
  		move_cursor(cursor, p);
  	return 0;
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list