Commit 7f7bac08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fuse-fixes-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse fixes from Miklos Szeredi:
 "Fix two rarely triggered but long-standing issues"

* tag 'fuse-fixes-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: add file_modified() to fallocate
  fuse: fix readdir cache race
parents f2f32f8a 4a6f278d

fs/fuse/file.c

+4 −0
Original line number Diff line number Diff line
@@ -3001,6 +3001,10 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, 
			goto out;

	}



	err = file_modified(file);

	if (err)

		goto out;



	if (!(mode & FALLOC_FL_KEEP_SIZE))

		set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);

fs/fuse/readdir.c

+9 −1
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ static void fuse_add_dirent_to_cache(struct file *file, 
		goto unlock;



	addr = kmap_local_page(page);

	if (!offset)

	if (!offset) {

		clear_page(addr);

		SetPageUptodate(page);

	}

	memcpy(addr + offset, dirent, reclen);

	kunmap_local(addr);

	fi->rdc.size = (index << PAGE_SHIFT) + offset + reclen;
@@ -516,6 +518,12 @@ static int fuse_readdir_cached(struct file *file, struct dir_context *ctx) 


	page = find_get_page_flags(file->f_mapping, index,

				   FGP_ACCESSED | FGP_LOCK);

	/* Page gone missing, then re-added to cache, but not initialized? */

	if (page && !PageUptodate(page)) {

		unlock_page(page);

		put_page(page);

		page = NULL;

	}

	spin_lock(&fi->rdc.lock);

	if (!page) {

		/*