wok-current diff linux64-aufs/stuff/fix_vfs_rename-5.10.220.patch @ rev 25728

Merge wok for both arch and few updates
author Stanislas Leduc <shann@slitaz.org>
date Thu Dec 05 08:39:45 2024 +0000 (9 months ago)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linux64-aufs/stuff/fix_vfs_rename-5.10.220.patch	Thu Dec 05 08:39:45 2024 +0000
     1.3 @@ -0,0 +1,34 @@
     1.4 +--- a/fs/aufs/vfsub.c
     1.5 ++++ b/fs/aufs/vfsub.c
     1.6 +@@ -416,9 +416,17 @@
     1.7 + 	if (unlikely(err))
     1.8 + 		goto out;
     1.9 + 
    1.10 ++	struct renamedata rd = {
    1.11 ++		.old_dir        	= src_dir,
    1.12 ++		.old_dentry     	= src_dentry,
    1.13 ++		.new_dir        	= dir,
    1.14 ++		.new_dentry		= path->dentry,
    1.15 ++		.delegated_inode	= delegated_inode,
    1.16 ++		.flags			= flags,
    1.17 ++	};
    1.18 ++
    1.19 + 	lockdep_off();
    1.20 +-	err = vfs_rename(src_dir, src_dentry, dir, path->dentry,
    1.21 +-			 delegated_inode, flags);
    1.22 ++	err = vfs_rename(&rd);
    1.23 + 	lockdep_on();
    1.24 + 	if (!err) {
    1.25 + 		int did;
    1.26 +--- a/fs/aufs/hfsnotify.c
    1.27 ++++ b/fs/aufs/hfsnotify.c
    1.28 +@@ -238,7 +238,8 @@
    1.29 + 		goto out;
    1.30 + 
    1.31 + 	err = 0;
    1.32 +-	group = fsnotify_alloc_group(&au_hfsn_ops);
    1.33 ++	group = fsnotify_alloc_group(&au_hfsn_ops,
    1.34 ++				/*flags - not for userspace*/0);
    1.35 + 	if (IS_ERR(group)) {
    1.36 + 		err = PTR_ERR(group);
    1.37 + 		pr_err("fsnotify_alloc_group() failed, %d\n", err);