Commit fcb70a56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.19-rc8.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs fixes from Christian Brauner:

 - Fix the the buggy conversion of fuse_reverse_inval_entry() introduced
   during the creation rework

 - Disallow nfs delegation requests for directories by setting
   simple_nosetlease()

 - Require an opt-in for getting readdir flag bits outside of S_DT_MASK
   set in d_type

 - Fix scheduling delayed writeback work by only scheduling when the
   dirty time expiry interval is non-zero and cancel the delayed work if
   the interval is set to zero

 - Use rounded_jiffies_interval for dirty time work

 - Check the return value of sb_set_blocksize() for romfs

 - Wait for batched folios to be stable in __iomap_get_folio()

 - Use private naming for fuse hash size

 - Fix the stale dentry cleanup to prevent a race that causes a UAF

* tag 'vfs-6.19-rc8.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  vfs: document d_dispose_if_unused()
  fuse: shrink once after all buckets have been scanned
  fuse: clean up fuse_dentry_tree_work()
  fuse: add need_resched() before unlocking bucket
  fuse: make sure dentry is evicted if stale
  fuse: fix race when disposing stale dentries
  fuse: use private naming for fuse hash size
  writeback: use round_jiffies_relative for dirtytime_work
  iomap: wait for batched folios to be stable in __iomap_get_folio
  romfs: check sb_set_blocksize() return value
  docs: clarify that dirtytime_expire_seconds=0 disables writeback
  writeback: fix 100% CPU usage when dirtytime_expire_interval is 0
  readdir: require opt-in for d_type flags
  vboxsf: don't allow delegations to be set on directories
  ceph: don't allow delegations to be set on directories
  gfs2: don't allow delegations to be set on directories
  9p: don't allow delegations to be set on directories
  smb/client: properly disallow delegations on directories
  nfs: properly disallow delegation requests on directories
  fuse: fix conversion of fuse_reverse_inval_entry() to start_removing()
parents 63804fed 63584611

Documentation/admin-guide/sysctl/vm.rst

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ eventually gets pushed out to disk. This tunable is used to define when dirty 
inode is old enough to be eligible for writeback by the kernel flusher threads.

And, it is also used as the interval to wakeup dirtytime_writeback thread.



Setting this to zero disables periodic dirtytime writeback.





dirty_writeback_centisecs

=========================

fs/9p/vfs_dir.c

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ const struct file_operations v9fs_dir_operations = { 
	.iterate_shared = v9fs_dir_readdir,

	.open = v9fs_file_open,

	.release = v9fs_dir_release,

	.setlease = simple_nosetlease,

};



const struct file_operations v9fs_dir_operations_dotl = {
@@ -251,4 +252,5 @@ const struct file_operations v9fs_dir_operations_dotl = { 
	.open = v9fs_file_open,

	.release = v9fs_dir_release,

	.fsync = v9fs_file_fsync_dotl,

	.setlease = simple_nosetlease,

};

fs/ceph/dir.c

+2 −0
Original line number Diff line number Diff line
@@ -2214,6 +2214,7 @@ const struct file_operations ceph_dir_fops = { 
	.fsync = ceph_fsync,

	.lock = ceph_lock,

	.flock = ceph_flock,

	.setlease = simple_nosetlease,

};



const struct file_operations ceph_snapdir_fops = {
@@ -2221,6 +2222,7 @@ const struct file_operations ceph_snapdir_fops = { 
	.llseek = ceph_dir_llseek,

	.open = ceph_open,

	.release = ceph_release,

	.setlease = simple_nosetlease,

};



const struct inode_operations ceph_dir_iops = {

fs/dcache.c

+10 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,16 @@ struct dentry *d_find_alias_rcu(struct inode *inode) 
	return de;

}



/**

 * d_dispose_if_unused - move unreferenced dentries to shrink list

 * @dentry: dentry in question

 * @dispose: head of shrink list

 *

 * If dentry has no external references, move it to shrink list.

 *

 * NOTE!!! The caller is responsible for preventing eviction of the dentry by

 * holding dentry->d_inode->i_lock or equivalent.

 */

void d_dispose_if_unused(struct dentry *dentry, struct list_head *dispose)

{

	spin_lock(&dentry->d_lock);

fs/fs-writeback.c

+12 −4
Original line number Diff line number Diff line
@@ -2492,7 +2492,9 @@ static void wakeup_dirtytime_writeback(struct work_struct *w) 
				wb_wakeup(wb);

	}

	rcu_read_unlock();

	schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);

	if (dirtytime_expire_interval)

		schedule_delayed_work(&dirtytime_work,

				      round_jiffies_relative(dirtytime_expire_interval * HZ));

}



static int dirtytime_interval_handler(const struct ctl_table *table, int write,
@@ -2501,8 +2503,12 @@ static int dirtytime_interval_handler(const struct ctl_table *table, int write, 
	int ret;



	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	if (ret == 0 && write)

	if (ret == 0 && write) {

		if (dirtytime_expire_interval)

			mod_delayed_work(system_percpu_wq, &dirtytime_work, 0);

		else

			cancel_delayed_work_sync(&dirtytime_work);

	}

	return ret;

}
@@ -2519,7 +2525,9 @@ static const struct ctl_table vm_fs_writeback_table[] = { 


static int __init start_dirtytime_writeback(void)

{

	schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);

	if (dirtytime_expire_interval)

		schedule_delayed_work(&dirtytime_work,

				      round_jiffies_relative(dirtytime_expire_interval * HZ));

	register_sysctl_init("vm", vm_fs_writeback_table);

	return 0;

}