Skip to content

Commit ef3da34

Browse files
committed
Merge tag 'vfs-7.1-rc1.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull misc vfs updates from Christian Brauner: "Features: - coredump: add tracepoint for coredump events - fs: hide file and bfile caches behind runtime const machinery Fixes: - fix architecture-specific compat_ftruncate64 implementations - dcache: Limit the minimal number of bucket to two - fs/omfs: reject s_sys_blocksize smaller than OMFS_DIR_START - fs/mbcache: cancel shrink work before destroying the cache - dcache: permit dynamic_dname()s up to NAME_MAX Cleanups: - remove or unexport unused fs_context infrastructure - trivial ->setattr cleanups - selftests/filesystems: Assume that TIOCGPTPEER is defined - writeback: fix kernel-doc function name mismatch for wb_put_many() - autofs: replace manual symlink buffer allocation in autofs_dir_symlink - init/initramfs.c: trivial fix: FSM -> Finite-state machine - fs: remove stale and duplicate forward declarations - readdir: Introduce dirent_size() - fs: Replace user_access_{begin/end} by scoped user access - kernel: acct: fix duplicate word in comment - fs: write a better comment in step_into() concerning .mnt assignment - fs: attr: fix comment formatting and spelling issues" * tag 'vfs-7.1-rc1.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: (28 commits) dcache: permit dynamic_dname()s up to NAME_MAX fs: attr: fix comment formatting and spelling issues fs: hide file and bfile caches behind runtime const machinery fs: write a better comment in step_into() concerning .mnt assignment proc: rename proc_notify_change to proc_setattr proc: rename proc_setattr to proc_nochmod_setattr affs: rename affs_notify_change to affs_setattr adfs: rename adfs_notify_change to adfs_setattr hfs: update comments on hfs_inode_setattr kernel: acct: fix duplicate word in comment fs: Replace user_access_{begin/end} by scoped user access readdir: Introduce dirent_size() coredump: add tracepoint for coredump events fs: remove do_sys_truncate fs: pass on FTRUNCATE_* flags to do_truncate fs: fix archiecture-specific compat_ftruncate64 fs: remove stale and duplicate forward declarations init/initramfs.c: trivial fix: FSM -> Finite-state machine autofs: replace manual symlink buffer allocation in autofs_dir_symlink fs/mbcache: cancel shrink work before destroying the cache ...
2 parents 07c3ef5 + 97b67e6 commit ef3da34

50 files changed

Lines changed: 225 additions & 252 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/filesystems/mount_api.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,9 +647,7 @@ The members are as follows:
647647
fs_param_is_u64 64-bit unsigned int result->uint_64
648648
fs_param_is_enum Enum value name result->uint_32
649649
fs_param_is_string Arbitrary string param->string
650-
fs_param_is_blob Binary blob param->blob
651650
fs_param_is_blockdev Blockdev path * Needs lookup
652-
fs_param_is_path Path * Needs lookup
653651
fs_param_is_fd File descriptor result->int_32
654652
fs_param_is_uid User ID (u32) result->uid
655653
fs_param_is_gid Group ID (u32) result->gid
@@ -681,9 +679,7 @@ The members are as follows:
681679
fsparam_u64() fs_param_is_u64
682680
fsparam_enum() fs_param_is_enum
683681
fsparam_string() fs_param_is_string
684-
fsparam_blob() fs_param_is_blob
685682
fsparam_bdev() fs_param_is_blockdev
686-
fsparam_path() fs_param_is_path
687683
fsparam_fd() fs_param_is_fd
688684
fsparam_uid() fs_param_is_uid
689685
fsparam_gid() fs_param_is_gid

arch/arm64/kernel/sys32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ COMPAT_SYSCALL_DEFINE4(aarch32_truncate64, const char __user *, pathname,
8989
COMPAT_SYSCALL_DEFINE4(aarch32_ftruncate64, unsigned int, fd, u32, __pad,
9090
arg_u32p(length))
9191
{
92-
return ksys_ftruncate(fd, arg_u64(length));
92+
return ksys_ftruncate(fd, arg_u64(length), FTRUNCATE_LFS);
9393
}
9494

9595
COMPAT_SYSCALL_DEFINE5(aarch32_readahead, int, fd, u32, __pad,

arch/mips/kernel/linux32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ SYSCALL_DEFINE4(32_truncate64, const char __user *, path,
6060
SYSCALL_DEFINE4(32_ftruncate64, unsigned long, fd, unsigned long, __dummy,
6161
unsigned long, a2, unsigned long, a3)
6262
{
63-
return ksys_ftruncate(fd, merge_64(a2, a3));
63+
return ksys_ftruncate(fd, merge_64(a2, a3), FTRUNCATE_LFS);
6464
}
6565

6666
SYSCALL_DEFINE5(32_llseek, unsigned int, fd, unsigned int, offset_high,

arch/parisc/kernel/sys_parisc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ asmlinkage long parisc_truncate64(const char __user * path,
216216
asmlinkage long parisc_ftruncate64(unsigned int fd,
217217
unsigned int high, unsigned int low)
218218
{
219-
return ksys_ftruncate(fd, (long)high << 32 | low);
219+
return ksys_ftruncate(fd, (long)high << 32 | low, FTRUNCATE_LFS);
220220
}
221221

222222
/* stubs for the benefit of the syscall_table since truncate64 and truncate
@@ -227,7 +227,7 @@ asmlinkage long sys_truncate64(const char __user * path, unsigned long length)
227227
}
228228
asmlinkage long sys_ftruncate64(unsigned int fd, unsigned long length)
229229
{
230-
return ksys_ftruncate(fd, length);
230+
return ksys_ftruncate(fd, length, FTRUNCATE_LFS);
231231
}
232232
asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)
233233
{

arch/powerpc/kernel/sys_ppc32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ PPC32_SYSCALL_DEFINE4(ppc_ftruncate64,
101101
unsigned int, fd, u32, reg4,
102102
unsigned long, len1, unsigned long, len2)
103103
{
104-
return ksys_ftruncate(fd, merge_64(len1, len2));
104+
return ksys_ftruncate(fd, merge_64(len1, len2), FTRUNCATE_LFS);
105105
}
106106

107107
PPC32_SYSCALL_DEFINE6(ppc32_fadvise64,

arch/sparc/kernel/sys_sparc32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ COMPAT_SYSCALL_DEFINE3(truncate64, const char __user *, path, u32, high, u32, lo
5858

5959
COMPAT_SYSCALL_DEFINE3(ftruncate64, unsigned int, fd, u32, high, u32, low)
6060
{
61-
return ksys_ftruncate(fd, ((u64)high << 32) | low);
61+
return ksys_ftruncate(fd, ((u64)high << 32) | low, FTRUNCATE_LFS);
6262
}
6363

6464
static int cp_compat_stat64(struct kstat *stat,

arch/x86/kernel/sys_ia32.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ SYSCALL_DEFINE3(ia32_truncate64, const char __user *, filename,
6161
SYSCALL_DEFINE3(ia32_ftruncate64, unsigned int, fd,
6262
unsigned long, offset_low, unsigned long, offset_high)
6363
{
64-
return ksys_ftruncate(fd, ((loff_t) offset_high << 32) | offset_low);
64+
return ksys_ftruncate(fd, ((loff_t) offset_high << 32) | offset_low,
65+
FTRUNCATE_LFS);
6566
}
6667

6768
/* warning: next two assume little endian */

fs/adfs/adfs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ struct adfs_discmap {
144144
/* Inode stuff */
145145
struct inode *adfs_iget(struct super_block *sb, struct object_info *obj);
146146
int adfs_write_inode(struct inode *inode, struct writeback_control *wbc);
147-
int adfs_notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
148-
struct iattr *attr);
147+
int adfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
148+
struct iattr *attr);
149149

150150
/* map.c */
151151
int adfs_map_lookup(struct super_block *sb, u32 frag_id, unsigned int offset);

fs/adfs/dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,5 +454,5 @@ adfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
454454
*/
455455
const struct inode_operations adfs_dir_inode_operations = {
456456
.lookup = adfs_lookup,
457-
.setattr = adfs_notify_change,
457+
.setattr = adfs_setattr,
458458
};

fs/adfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ const struct file_operations adfs_file_operations = {
3232
};
3333

3434
const struct inode_operations adfs_file_inode_operations = {
35-
.setattr = adfs_notify_change,
35+
.setattr = adfs_setattr,
3636
};

0 commit comments

Comments
 (0)