wok-current annotate linux/stuff/aufs4-base.patch @ rev 25792

Fix openbox menu, label keymap on lxpanel and add miss it translation for tazpkg
author Stanislas Leduc <shann@slitaz.org>
date Tue Oct 07 05:55:24 2025 +0000 (2 weeks ago)
parents
children
rev   line source
shann@25629 1 SPDX-License-Identifier: GPL-2.0
shann@25629 2 aufs4.19 base patch
shann@25629 3
shann@25629 4 diff --git a/MAINTAINERS b/MAINTAINERS
shann@25629 5 index b2f710eee67a7..8449c695ba0b1 100644
shann@25629 6 --- a/MAINTAINERS
shann@25629 7 +++ b/MAINTAINERS
shann@25629 8 @@ -2605,6 +2605,19 @@ F: include/linux/audit.h
shann@25629 9 F: include/uapi/linux/audit.h
shann@25629 10 F: kernel/audit*
shann@25629 11
shann@25629 12 +AUFS (advanced multi layered unification filesystem) FILESYSTEM
shann@25629 13 +M: "J. R. Okajima" <hooanon05g@gmail.com>
shann@25629 14 +L: aufs-users@lists.sourceforge.net (members only)
shann@25629 15 +L: linux-unionfs@vger.kernel.org
shann@25629 16 +W: http://aufs.sourceforge.net
shann@25629 17 +T: git://github.com/sfjro/aufs4-linux.git
shann@25629 18 +S: Supported
shann@25629 19 +F: Documentation/filesystems/aufs/
shann@25629 20 +F: Documentation/ABI/testing/debugfs-aufs
shann@25629 21 +F: Documentation/ABI/testing/sysfs-aufs
shann@25629 22 +F: fs/aufs/
shann@25629 23 +F: include/uapi/linux/aufs_type.h
shann@25629 24 +
shann@25629 25 AUXILIARY DISPLAY DRIVERS
shann@25629 26 M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
shann@25629 27 S: Maintained
shann@25629 28 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
shann@25629 29 index ea9debf59b225..9e534a36c5941 100644
shann@25629 30 --- a/drivers/block/loop.c
shann@25629 31 +++ b/drivers/block/loop.c
shann@25629 32 @@ -739,6 +739,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
shann@25629 33 return error;
shann@25629 34 }
shann@25629 35
shann@25629 36 +/*
shann@25629 37 + * for AUFS
shann@25629 38 + * no get/put for file.
shann@25629 39 + */
shann@25629 40 +struct file *loop_backing_file(struct super_block *sb)
shann@25629 41 +{
shann@25629 42 + struct file *ret;
shann@25629 43 + struct loop_device *l;
shann@25629 44 +
shann@25629 45 + ret = NULL;
shann@25629 46 + if (MAJOR(sb->s_dev) == LOOP_MAJOR) {
shann@25629 47 + l = sb->s_bdev->bd_disk->private_data;
shann@25629 48 + ret = l->lo_backing_file;
shann@25629 49 + }
shann@25629 50 + return ret;
shann@25629 51 +}
shann@25629 52 +EXPORT_SYMBOL_GPL(loop_backing_file);
shann@25629 53 +
shann@25629 54 /* loop sysfs attributes */
shann@25629 55
shann@25629 56 static ssize_t loop_attr_show(struct device *dev, char *page,
shann@25629 57 diff --git a/fs/dcache.c b/fs/dcache.c
shann@25629 58 index 2e7e8d85e9b40..9f57bd87bce5a 100644
shann@25629 59 --- a/fs/dcache.c
shann@25629 60 +++ b/fs/dcache.c
shann@25629 61 @@ -1238,7 +1238,7 @@ enum d_walk_ret {
shann@25629 62 *
shann@25629 63 * The @enter() callbacks are called with d_lock held.
shann@25629 64 */
shann@25629 65 -static void d_walk(struct dentry *parent, void *data,
shann@25629 66 +void d_walk(struct dentry *parent, void *data,
shann@25629 67 enum d_walk_ret (*enter)(void *, struct dentry *))
shann@25629 68 {
shann@25629 69 struct dentry *this_parent;
shann@25629 70 diff --git a/fs/fcntl.c b/fs/fcntl.c
shann@25629 71 index 4137d96534a6c..d4da10be555c9 100644
shann@25629 72 --- a/fs/fcntl.c
shann@25629 73 +++ b/fs/fcntl.c
shann@25629 74 @@ -32,7 +32,7 @@
shann@25629 75
shann@25629 76 #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
shann@25629 77
shann@25629 78 -static int setfl(int fd, struct file * filp, unsigned long arg)
shann@25629 79 +int setfl(int fd, struct file *filp, unsigned long arg)
shann@25629 80 {
shann@25629 81 struct inode * inode = file_inode(filp);
shann@25629 82 int error = 0;
shann@25629 83 @@ -63,6 +63,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
shann@25629 84
shann@25629 85 if (filp->f_op->check_flags)
shann@25629 86 error = filp->f_op->check_flags(arg);
shann@25629 87 + if (!error && filp->f_op->setfl)
shann@25629 88 + error = filp->f_op->setfl(filp, arg);
shann@25629 89 if (error)
shann@25629 90 return error;
shann@25629 91
shann@25629 92 diff --git a/fs/inode.c b/fs/inode.c
shann@25629 93 index 42f6d25f32a52..fa6ae6a217fbd 100644
shann@25629 94 --- a/fs/inode.c
shann@25629 95 +++ b/fs/inode.c
shann@25629 96 @@ -1657,7 +1657,7 @@ EXPORT_SYMBOL(generic_update_time);
shann@25629 97 * This does the actual work of updating an inodes time or version. Must have
shann@25629 98 * had called mnt_want_write() before calling this.
shann@25629 99 */
shann@25629 100 -static int update_time(struct inode *inode, struct timespec64 *time, int flags)
shann@25629 101 +int update_time(struct inode *inode, struct timespec64 *time, int flags)
shann@25629 102 {
shann@25629 103 int (*update_time)(struct inode *, struct timespec64 *, int);
shann@25629 104
shann@25629 105 diff --git a/fs/namespace.c b/fs/namespace.c
shann@25629 106 index 99186556f8d34..72c93f3e86478 100644
shann@25629 107 --- a/fs/namespace.c
shann@25629 108 +++ b/fs/namespace.c
shann@25629 109 @@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
shann@25629 110 return mnt->mnt_ns == current->nsproxy->mnt_ns;
shann@25629 111 }
shann@25629 112
shann@25629 113 +/* for aufs, CONFIG_AUFS_BR_FUSE */
shann@25629 114 +int is_current_mnt_ns(struct vfsmount *mnt)
shann@25629 115 +{
shann@25629 116 + return check_mnt(real_mount(mnt));
shann@25629 117 +}
shann@25629 118 +
shann@25629 119 /*
shann@25629 120 * vfsmount lock must be held for write
shann@25629 121 */
shann@25629 122 diff --git a/fs/read_write.c b/fs/read_write.c
shann@25629 123 index 8a2737f0d61d3..45e3e7a0d4e64 100644
shann@25629 124 --- a/fs/read_write.c
shann@25629 125 +++ b/fs/read_write.c
shann@25629 126 @@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
shann@25629 127 return -EINVAL;
shann@25629 128 }
shann@25629 129
shann@25629 130 +vfs_readf_t vfs_readf(struct file *file)
shann@25629 131 +{
shann@25629 132 + const struct file_operations *fop = file->f_op;
shann@25629 133 +
shann@25629 134 + if (fop->read)
shann@25629 135 + return fop->read;
shann@25629 136 + if (fop->read_iter)
shann@25629 137 + return new_sync_read;
shann@25629 138 + return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */
shann@25629 139 +}
shann@25629 140 +
shann@25629 141 +vfs_writef_t vfs_writef(struct file *file)
shann@25629 142 +{
shann@25629 143 + const struct file_operations *fop = file->f_op;
shann@25629 144 +
shann@25629 145 + if (fop->write)
shann@25629 146 + return fop->write;
shann@25629 147 + if (fop->write_iter)
shann@25629 148 + return new_sync_write;
shann@25629 149 + return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */
shann@25629 150 +}
shann@25629 151 +
shann@25629 152 ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
shann@25629 153 {
shann@25629 154 mm_segment_t old_fs;
shann@25629 155 diff --git a/fs/splice.c b/fs/splice.c
shann@25629 156 index b3daa971f5977..1dd7f96b22dc4 100644
shann@25629 157 --- a/fs/splice.c
shann@25629 158 +++ b/fs/splice.c
shann@25629 159 @@ -838,8 +838,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
shann@25629 160 /*
shann@25629 161 * Attempt to initiate a splice from pipe to file.
shann@25629 162 */
shann@25629 163 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
shann@25629 164 - loff_t *ppos, size_t len, unsigned int flags)
shann@25629 165 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
shann@25629 166 + loff_t *ppos, size_t len, unsigned int flags)
shann@25629 167 {
shann@25629 168 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
shann@25629 169 loff_t *, size_t, unsigned int);
shann@25629 170 @@ -855,9 +855,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
shann@25629 171 /*
shann@25629 172 * Attempt to initiate a splice from a file to a pipe.
shann@25629 173 */
shann@25629 174 -static long do_splice_to(struct file *in, loff_t *ppos,
shann@25629 175 - struct pipe_inode_info *pipe, size_t len,
shann@25629 176 - unsigned int flags)
shann@25629 177 +long do_splice_to(struct file *in, loff_t *ppos,
shann@25629 178 + struct pipe_inode_info *pipe, size_t len,
shann@25629 179 + unsigned int flags)
shann@25629 180 {
shann@25629 181 ssize_t (*splice_read)(struct file *, loff_t *,
shann@25629 182 struct pipe_inode_info *, size_t, unsigned int);
shann@25629 183 diff --git a/fs/sync.c b/fs/sync.c
shann@25629 184 index b54e0541ad899..28607828e96f2 100644
shann@25629 185 --- a/fs/sync.c
shann@25629 186 +++ b/fs/sync.c
shann@25629 187 @@ -28,7 +28,7 @@
shann@25629 188 * wait == 1 case since in that case write_inode() functions do
shann@25629 189 * sync_dirty_buffer() and thus effectively write one block at a time.
shann@25629 190 */
shann@25629 191 -static int __sync_filesystem(struct super_block *sb, int wait)
shann@25629 192 +int __sync_filesystem(struct super_block *sb, int wait)
shann@25629 193 {
shann@25629 194 if (wait)
shann@25629 195 sync_inodes_sb(sb);
shann@25629 196 diff --git a/include/linux/fs.h b/include/linux/fs.h
shann@25629 197 index 897eae8faee1b..41da4219febfe 100644
shann@25629 198 --- a/include/linux/fs.h
shann@25629 199 +++ b/include/linux/fs.h
shann@25629 200 @@ -1286,6 +1286,7 @@ extern void fasync_free(struct fasync_struct *);
shann@25629 201 /* can be called from interrupts */
shann@25629 202 extern void kill_fasync(struct fasync_struct **, int, int);
shann@25629 203
shann@25629 204 +extern int setfl(int fd, struct file *filp, unsigned long arg);
shann@25629 205 extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
shann@25629 206 extern int f_setown(struct file *filp, unsigned long arg, int force);
shann@25629 207 extern void f_delown(struct file *filp);
shann@25629 208 @@ -1747,6 +1748,7 @@ struct file_operations {
shann@25629 209 ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
shann@25629 210 unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
shann@25629 211 int (*check_flags)(int);
shann@25629 212 + int (*setfl)(struct file *, unsigned long);
shann@25629 213 int (*flock) (struct file *, int, struct file_lock *);
shann@25629 214 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
shann@25629 215 ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
shann@25629 216 @@ -1818,6 +1820,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
shann@25629 217 struct iovec *fast_pointer,
shann@25629 218 struct iovec **ret_pointer);
shann@25629 219
shann@25629 220 +typedef ssize_t (*vfs_readf_t)(struct file *, char __user *, size_t, loff_t *);
shann@25629 221 +typedef ssize_t (*vfs_writef_t)(struct file *, const char __user *, size_t,
shann@25629 222 + loff_t *);
shann@25629 223 +vfs_readf_t vfs_readf(struct file *file);
shann@25629 224 +vfs_writef_t vfs_writef(struct file *file);
shann@25629 225 +
shann@25629 226 extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
shann@25629 227 extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
shann@25629 228 extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
shann@25629 229 @@ -2243,6 +2251,7 @@ extern int current_umask(void);
shann@25629 230 extern void ihold(struct inode * inode);
shann@25629 231 extern void iput(struct inode *);
shann@25629 232 extern int generic_update_time(struct inode *, struct timespec64 *, int);
shann@25629 233 +extern int update_time(struct inode *, struct timespec64 *, int);
shann@25629 234
shann@25629 235 /* /sys/fs */
shann@25629 236 extern struct kobject *fs_kobj;
shann@25629 237 @@ -2530,6 +2539,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
shann@25629 238 return false;
shann@25629 239 }
shann@25629 240 #endif
shann@25629 241 +extern int __sync_filesystem(struct super_block *, int);
shann@25629 242 extern int sync_filesystem(struct super_block *);
shann@25629 243 extern const struct file_operations def_blk_fops;
shann@25629 244 extern const struct file_operations def_chr_fops;
shann@25629 245 diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
shann@25629 246 index b0d0b51c4d850..f73ffaa0199ee 100644
shann@25629 247 --- a/include/linux/lockdep.h
shann@25629 248 +++ b/include/linux/lockdep.h
shann@25629 249 @@ -313,6 +313,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
shann@25629 250 return lock->key == key;
shann@25629 251 }
shann@25629 252
shann@25629 253 +struct lock_class *lockdep_hlock_class(struct held_lock *hlock);
shann@25629 254 +
shann@25629 255 /*
shann@25629 256 * Acquire a lock.
shann@25629 257 *
shann@25629 258 @@ -439,6 +441,7 @@ struct lockdep_map { };
shann@25629 259
shann@25629 260 #define lockdep_depth(tsk) (0)
shann@25629 261
shann@25629 262 +#define lockdep_is_held(lock) (1)
shann@25629 263 #define lockdep_is_held_type(l, r) (1)
shann@25629 264
shann@25629 265 #define lockdep_assert_held(l) do { (void)(l); } while (0)
shann@25629 266 diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
shann@25629 267 index 35942084cd40d..24f5fd1a789de 100644
shann@25629 268 --- a/include/linux/mnt_namespace.h
shann@25629 269 +++ b/include/linux/mnt_namespace.h
shann@25629 270 @@ -6,11 +6,14 @@
shann@25629 271 struct mnt_namespace;
shann@25629 272 struct fs_struct;
shann@25629 273 struct user_namespace;
shann@25629 274 +struct vfsmount;
shann@25629 275
shann@25629 276 extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,
shann@25629 277 struct user_namespace *, struct fs_struct *);
shann@25629 278 extern void put_mnt_ns(struct mnt_namespace *ns);
shann@25629 279
shann@25629 280 +extern int is_current_mnt_ns(struct vfsmount *mnt);
shann@25629 281 +
shann@25629 282 extern const struct file_operations proc_mounts_operations;
shann@25629 283 extern const struct file_operations proc_mountinfo_operations;
shann@25629 284 extern const struct file_operations proc_mountstats_operations;
shann@25629 285 diff --git a/include/linux/splice.h b/include/linux/splice.h
shann@25629 286 index 74b4911ac16dd..19789fbea5675 100644
shann@25629 287 --- a/include/linux/splice.h
shann@25629 288 +++ b/include/linux/splice.h
shann@25629 289 @@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
shann@25629 290
shann@25629 291 extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
shann@25629 292 extern const struct pipe_buf_operations default_pipe_buf_ops;
shann@25629 293 +
shann@25629 294 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
shann@25629 295 + loff_t *ppos, size_t len, unsigned int flags);
shann@25629 296 +extern long do_splice_to(struct file *in, loff_t *ppos,
shann@25629 297 + struct pipe_inode_info *pipe, size_t len,
shann@25629 298 + unsigned int flags);
shann@25629 299 #endif
shann@25629 300 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
shann@25629 301 index dd13f865ad40e..fa6f5599a2a5e 100644
shann@25629 302 --- a/kernel/locking/lockdep.c
shann@25629 303 +++ b/kernel/locking/lockdep.c
shann@25629 304 @@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
shann@25629 305 unsigned long nr_lock_classes;
shann@25629 306 static struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
shann@25629 307
shann@25629 308 -static inline struct lock_class *hlock_class(struct held_lock *hlock)
shann@25629 309 +inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
shann@25629 310 {
shann@25629 311 if (!hlock->class_idx) {
shann@25629 312 /*
shann@25629 313 @@ -151,6 +151,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
shann@25629 314 }
shann@25629 315 return lock_classes + hlock->class_idx - 1;
shann@25629 316 }
shann@25629 317 +#define hlock_class(hlock) lockdep_hlock_class(hlock)
shann@25629 318
shann@25629 319 #ifdef CONFIG_LOCK_STAT
shann@25629 320 static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);