Skip to content

GitLab

Commit 71aa8fd6 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

5.x-rcN 20200413 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 351efcf4
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 71aa8fd6
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index fcd79fc38928..9751b7b48696 100644 index 5a5332b3591d..51301c0ab275 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2919,6 +2919,19 @@ F: include/linux/audit.h @@ -2919,6 +2919,19 @@ F: include/linux/audit.h
...@@ -68,7 +68,7 @@ index b280e07e162b..046000653e4d 100644 ...@@ -68,7 +68,7 @@ index b280e07e162b..046000653e4d 100644
{ {
struct dentry *this_parent; struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index 9bc167562ee8..b0935c67bd1e 100644 index 2e4c0fa2074b..0b28a37f7e50 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
...@@ -90,10 +90,10 @@ index 9bc167562ee8..b0935c67bd1e 100644 ...@@ -90,10 +90,10 @@ index 9bc167562ee8..b0935c67bd1e 100644
return error; return error;
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index 7d57068b6b7a..c5a5578773d4 100644 index 93d9252a00ab..7700c5e4783b 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1687,7 +1687,7 @@ EXPORT_SYMBOL(generic_update_time); @@ -1688,7 +1688,7 @@ EXPORT_SYMBOL(generic_update_time);
* This does the actual work of updating an inodes time or version. Must have * This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this. * had called mnt_want_write() before calling this.
*/ */
...@@ -194,10 +194,10 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644 ...@@ -194,10 +194,10 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644
if (wait) if (wait)
sync_inodes_sb(sb); sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index 3cd4fe6b845e..6d1e37a014f3 100644 index abedbffe2c9e..944485ac54b4 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1349,6 +1349,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1350,6 +1350,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */ /* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int); extern void kill_fasync(struct fasync_struct **, int, int);
...@@ -205,7 +205,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644 ...@@ -205,7 +205,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force); extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp); extern void f_delown(struct file *filp);
@@ -1841,6 +1842,7 @@ struct file_operations { @@ -1842,6 +1843,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int); int (*check_flags)(int);
...@@ -213,7 +213,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644 ...@@ -213,7 +213,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
int (*flock) (struct file *, int, struct file_lock *); int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -1911,6 +1913,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, @@ -1912,6 +1914,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer, struct iovec *fast_pointer,
struct iovec **ret_pointer); struct iovec **ret_pointer);
...@@ -226,7 +226,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644 ...@@ -226,7 +226,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
@@ -2343,6 +2351,7 @@ extern int current_umask(void); @@ -2344,6 +2352,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode); extern void ihold(struct inode * inode);
extern void iput(struct inode *); extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int); extern int generic_update_time(struct inode *, struct timespec64 *, int);
...@@ -234,7 +234,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644 ...@@ -234,7 +234,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
/* /sys/fs */ /* /sys/fs */
extern struct kobject *fs_kobj; extern struct kobject *fs_kobj;
@@ -2627,6 +2636,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) @@ -2628,6 +2637,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false; return false;
} }
#endif #endif
......
aufs5-loopback.patch
View file @ 71aa8fd6
...@@ -228,10 +228,10 @@ index 589dd0122020..801e0a7faec5 100644 ...@@ -228,10 +228,10 @@ index 589dd0122020..801e0a7faec5 100644
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6d1e37a014f3..ce2c9b4bae13 100644 index 944485ac54b4..eccc62765e95 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1979,6 +1979,10 @@ struct super_operations { @@ -1980,6 +1980,10 @@ struct super_operations {
struct shrink_control *); struct shrink_control *);
long (*free_cached_objects)(struct super_block *, long (*free_cached_objects)(struct super_block *,
struct shrink_control *); struct shrink_control *);
......
aufs5-mmap.patch
View file @ 71aa8fd6
...@@ -72,7 +72,7 @@ index 7907e6419e57..d17209cf52bc 100644 ...@@ -72,7 +72,7 @@ index 7907e6419e57..d17209cf52bc 100644
ino = inode->i_ino; ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h diff --git a/include/linux/mm.h b/include/linux/mm.h
index 52269e56c514..32aa6b1ea1d2 100644 index c54fb96cb1e6..393304f0526d 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1487,6 +1487,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1487,6 +1487,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
...@@ -125,7 +125,7 @@ index c28911c3afa8..23d069c0e171 100644 ...@@ -125,7 +125,7 @@ index c28911c3afa8..23d069c0e171 100644
#ifdef CONFIG_SWAP #ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index 60a1295f4384..44682dd97ca6 100644 index d90af13431c7..01316a9e226f 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -565,7 +565,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -565,7 +565,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
...@@ -261,10 +261,10 @@ index d681a20eb4ea..36c80ae89cee 100644 ...@@ -261,10 +261,10 @@ index d681a20eb4ea..36c80ae89cee 100644
new_vma->vm_ops->open(new_vma); new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent); vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c diff --git a/mm/nommu.c b/mm/nommu.c
index bd2b4e5ef144..acdab5253263 100644 index 318df4e236c9..7f051e86ea1d 100644
--- a/mm/nommu.c --- a/mm/nommu.c
+++ b/mm/nommu.c +++ b/mm/nommu.c
@@ -563,7 +563,7 @@ static void __put_nommu_region(struct vm_region *region) @@ -567,7 +567,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
if (region->vm_file) if (region->vm_file)
...@@ -273,7 +273,7 @@ index bd2b4e5ef144..acdab5253263 100644 ...@@ -273,7 +273,7 @@ index bd2b4e5ef144..acdab5253263 100644
/* IO memory and memory shared directly out of the pagecache /* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */ * from ramfs/tmpfs mustn't be released here */
@@ -695,7 +695,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) @@ -699,7 +699,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close) if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma); vma->vm_ops->close(vma);
if (vma->vm_file) if (vma->vm_file)
...@@ -282,7 +282,7 @@ index bd2b4e5ef144..acdab5253263 100644 ...@@ -282,7 +282,7 @@ index bd2b4e5ef144..acdab5253263 100644
put_nommu_region(vma->vm_region); put_nommu_region(vma->vm_region);
vm_area_free(vma); vm_area_free(vma);
} }
@@ -1218,7 +1218,7 @@ unsigned long do_mmap(struct file *file, @@ -1222,7 +1222,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free; goto error_just_free;
} }
} }
...@@ -291,7 +291,7 @@ index bd2b4e5ef144..acdab5253263 100644 ...@@ -291,7 +291,7 @@ index bd2b4e5ef144..acdab5253263 100644
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
region = pregion; region = pregion;
result = start; result = start;
@@ -1295,10 +1295,10 @@ unsigned long do_mmap(struct file *file, @@ -1299,10 +1299,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
error: error:
if (region->vm_file) if (region->vm_file)
......
aufs5-standalone.patch
View file @ 71aa8fd6
...@@ -34,7 +34,7 @@ index db17be51b112..4bb61917a29a 100644 ...@@ -34,7 +34,7 @@ index db17be51b112..4bb61917a29a 100644
#ifdef CONFIG_USELIB #ifdef CONFIG_USELIB
/* /*
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index b0935c67bd1e..07251ba86c31 100644 index 0b28a37f7e50..f2c90a416b75 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg) @@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
...@@ -66,10 +66,10 @@ index 30d55c9a1744..34b9bbf4c556 100644 ...@@ -66,10 +66,10 @@ index 30d55c9a1744..34b9bbf4c556 100644
void __init files_init(void) void __init files_init(void)
{ {
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index c5a5578773d4..5995e737f64a 100644 index 7700c5e4783b..6284b41fcf3f 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1693,6 +1693,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags) @@ -1694,6 +1694,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
return inode->i_op->update_time(inode, time, flags); return inode->i_op->update_time(inode, time, flags);
return generic_update_time(inode, time, flags); return generic_update_time(inode, time, flags);
} }
...@@ -118,7 +118,7 @@ index 133f723aca07..0b9f7f6d8390 100644 ...@@ -118,7 +118,7 @@ index 133f723aca07..0b9f7f6d8390 100644
/* /*
* 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 --git a/fs/open.c b/fs/open.c diff --git a/fs/open.c b/fs/open.c
index 0788b3715731..cec8ceac6f16 100644 index b69d6eed67e6..cb777a1888f7 100644
--- a/fs/open.c --- a/fs/open.c
+++ b/fs/open.c +++ b/fs/open.c
@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, @@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
......
include/uapi/linux/aufs_type.h
View file @ 71aa8fd6
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20200302" #define AUFS_VERSION "5.x-rcN-20200413"
/* todo? move this to linux-2.6.19/include/magic.h */ /* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
tmpfs-idr.patch
View file @ 71aa8fd6
...@@ -21,7 +21,7 @@ index d56fefef8905..a02150911167 100644 ...@@ -21,7 +21,7 @@ index d56fefef8905..a02150911167 100644
umode_t mode; /* Mount mode for root directory */ umode_t mode; /* Mount mode for root directory */
unsigned char huge; /* Whether to try for hugepages */ unsigned char huge; /* Whether to try for hugepages */
diff --git a/mm/shmem.c b/mm/shmem.c diff --git a/mm/shmem.c b/mm/shmem.c
index c8f7540ef048..f001b83ad1c3 100644 index aad3ba74b0e9..b03afb79fa59 100644
--- a/mm/shmem.c --- a/mm/shmem.c
+++ b/mm/shmem.c +++ b/mm/shmem.c
@@ -110,7 +110,7 @@ struct shmem_falloc { @@ -110,7 +110,7 @@ struct shmem_falloc {
...@@ -165,7 +165,7 @@ index c8f7540ef048..f001b83ad1c3 100644 ...@@ -165,7 +165,7 @@ index c8f7540ef048..f001b83ad1c3 100644
return 1; return 1;
} }
@@ -3437,7 +3445,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) @@ -3435,7 +3443,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
break; break;
case Opt_nr_inodes: case Opt_nr_inodes:
ctx->inodes = memparse(param->string, &rest); ctx->inodes = memparse(param->string, &rest);
...@@ -174,7 +174,7 @@ index c8f7540ef048..f001b83ad1c3 100644 ...@@ -174,7 +174,7 @@ index c8f7540ef048..f001b83ad1c3 100644
goto bad_value; goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES; ctx->seen |= SHMEM_SEEN_INODES;
break; break;
@@ -3535,7 +3543,7 @@ static int shmem_reconfigure(struct fs_context *fc) @@ -3533,7 +3541,7 @@ static int shmem_reconfigure(struct fs_context *fc)
{ {
struct shmem_options *ctx = fc->fs_private; struct shmem_options *ctx = fc->fs_private;
struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb); struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb);
...@@ -183,7 +183,7 @@ index c8f7540ef048..f001b83ad1c3 100644 ...@@ -183,7 +183,7 @@ index c8f7540ef048..f001b83ad1c3 100644
const char *err; const char *err;
spin_lock(&sbinfo->stat_lock); spin_lock(&sbinfo->stat_lock);
@@ -3594,7 +3602,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) @@ -3592,7 +3600,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
seq_printf(seq, ",size=%luk", seq_printf(seq, ",size=%luk",
sbinfo->max_blocks << (PAGE_SHIFT - 10)); sbinfo->max_blocks << (PAGE_SHIFT - 10));
if (sbinfo->max_inodes != shmem_default_max_inodes()) if (sbinfo->max_inodes != shmem_default_max_inodes())
...@@ -192,7 +192,7 @@ index c8f7540ef048..f001b83ad1c3 100644 ...@@ -192,7 +192,7 @@ index c8f7540ef048..f001b83ad1c3 100644
if (sbinfo->mode != (0777 | S_ISVTX)) if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode); seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID)) if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3618,6 +3626,8 @@ static void shmem_put_super(struct super_block *sb) @@ -3616,6 +3624,8 @@ static void shmem_put_super(struct super_block *sb)
{ {
struct shmem_sb_info *sbinfo = SHMEM_SB(sb); struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
...@@ -201,7 +201,7 @@ index c8f7540ef048..f001b83ad1c3 100644 ...@@ -201,7 +201,7 @@ index c8f7540ef048..f001b83ad1c3 100644
percpu_counter_destroy(&sbinfo->used_blocks); percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol); mpol_put(sbinfo->mpol);
kfree(sbinfo); kfree(sbinfo);
@@ -3658,6 +3668,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) @@ -3656,6 +3666,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
#else #else
sb->s_flags |= SB_NOUSER; sb->s_flags |= SB_NOUSER;
#endif #endif
...@@ -210,7 +210,7 @@ index c8f7540ef048..f001b83ad1c3 100644 ...@@ -210,7 +210,7 @@ index c8f7540ef048..f001b83ad1c3 100644
sbinfo->max_blocks = ctx->blocks; sbinfo->max_blocks = ctx->blocks;
sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes; sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
sbinfo->uid = ctx->uid; sbinfo->uid = ctx->uid;
@@ -3769,6 +3781,15 @@ static void shmem_destroy_inodecache(void) @@ -3767,6 +3779,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep); kmem_cache_destroy(shmem_inode_cachep);
} }
...@@ -226,7 +226,7 @@ index c8f7540ef048..f001b83ad1c3 100644 ...@@ -226,7 +226,7 @@ index c8f7540ef048..f001b83ad1c3 100644
static const struct address_space_operations shmem_aops = { static const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage, .writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback, .set_page_dirty = __set_page_dirty_no_writeback,
@@ -3909,6 +3930,7 @@ int __init shmem_init(void) @@ -3907,6 +3928,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n"); pr_err("Could not kern_mount tmpfs\n");
goto out1; goto out1;
} }
......
vfs-ino.patch
View file @ 71aa8fd6
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index 7d57068b6b7a..d78538d2e0c0 100644 index 93d9252a00ab..325fbc77b91a 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -893,6 +893,8 @@ unsigned int get_next_ino(void) @@ -894,6 +894,8 @@ unsigned int get_next_ino(void)
unsigned int *p = &get_cpu_var(last_ino); unsigned int *p = &get_cpu_var(last_ino);
unsigned int res = *p; unsigned int res = *p;
...@@ -13,7 +13,7 @@ index 7d57068b6b7a..d78538d2e0c0 100644 ...@@ -13,7 +13,7 @@ index 7d57068b6b7a..d78538d2e0c0 100644
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
static atomic_t shared_last_ino; static atomic_t shared_last_ino;
@@ -905,7 +907,7 @@ unsigned int get_next_ino(void) @@ -906,7 +908,7 @@ unsigned int get_next_ino(void)
res++; res++;
/* get_next_ino should not provide a 0 inode number */ /* get_next_ino should not provide a 0 inode number */
if (unlikely(!res)) if (unlikely(!res))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment