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

Merge tag 'vfs-6.8-rc2.netfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull netfs fixes from Christian Brauner:
 "This contains various fixes for the netfs work merged earlier this
  cycle:

  afs:
   - Fix locking imbalance in afs_proc_addr_prefs_show()
   - Remove afs_dynroot_d_revalidate() which is redundant
   - Fix error handling during lookup
   - Hide sillyrenames from userspace. This fixes a race between
     silly-rename files being created/removed and userspace iterating
     over directory entries
   - Don't use unnecessary folio_*() functions

  cifs:
   - Don't use unnecessary folio_*() functions

  cachefiles:
   - erofs: Fix Null dereference when cachefiles are not doing
     ondemand-mode
   - Update mailing list

  netfs library:
   - Add Jeff Layton as reviewer
   - Update mailing list
   - Fix a error checking in netfs_perform_write()
   - fscache: Check error before dereferencing
   - Don't use unnecessary folio_*() functions"

* tag 'vfs-6.8-rc2.netfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  afs: Fix missing/incorrect unlocking of RCU read lock
  afs: Remove afs_dynroot_d_revalidate() as it is redundant
  afs: Fix error handling with lookup via FS.InlineBulkStatus
  afs: Hide silly-rename files from userspace
  cachefiles, erofs: Fix NULL deref in when cachefiles is not doing ondemand-mode
  netfs: Fix a NULL vs IS_ERR() check in netfs_perform_write()
  netfs, fscache: Prevent Oops in fscache_put_cache()
  cifs: Don't use certain unnecessary folio_*() functions
  afs: Don't use certain unnecessary folio_*() functions
  netfs: Don't use certain unnecessary folio_*() functions
  netfs: Add Jeff Layton as reviewer
  netfs, cachefiles: Change mailing list
parents b9fa4cbd f13d8f28

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -4547,7 +4547,7 @@ F: drivers/net/ieee802154/ca8210.c 








CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS









M:	David Howells <dhowells@redhat.com>









L:	linux-cachefs@redhat.com (moderated for non-subscribers)









L:	netfs@lists.linux.dev









S:	Supported









F:	Documentation/filesystems/caching/cachefiles.rst









F:	fs/cachefiles/








@@ -8224,7 +8224,8 @@ F:	include/linux/iomap.h















FILESYSTEMS [NETFS LIBRARY]









M:	David Howells <dhowells@redhat.com>









L:	linux-cachefs@redhat.com (moderated for non-subscribers)









R:	Jeff Layton <jlayton@kernel.org>









L:	netfs@lists.linux.dev









L:	linux-fsdevel@vger.kernel.org









S:	Supported









F:	Documentation/filesystems/caching/
































fs/afs/dir.c



+22
−8






























Original line number
Diff line number
Diff line







@@ -124,7 +124,7 @@ static void afs_dir_read_cleanup(struct afs_read *req)







		if (xas_retry(&xas, folio))









			continue;









		BUG_ON(xa_is_value(folio));









		ASSERTCMP(folio_file_mapping(folio), ==, mapping);









		ASSERTCMP(folio->mapping, ==, mapping);



















		folio_put(folio);









	}








@@ -202,12 +202,12 @@ static void afs_dir_dump(struct afs_vnode *dvnode, struct afs_read *req)







		if (xas_retry(&xas, folio))









			continue;



















		BUG_ON(folio_file_mapping(folio) != mapping);









		BUG_ON(folio->mapping != mapping);



















		size = min_t(loff_t, folio_size(folio), req->actual_len - folio_pos(folio));









		for (offset = 0; offset < size; offset += sizeof(*block)) {









			block = kmap_local_folio(folio, offset);









			pr_warn("[%02lx] %32phN\n", folio_index(folio) + offset, block);









			pr_warn("[%02lx] %32phN\n", folio->index + offset, block);









			kunmap_local(block);









		}









	}








@@ -233,7 +233,7 @@ static int afs_dir_check(struct afs_vnode *dvnode, struct afs_read *req)







		if (xas_retry(&xas, folio))









			continue;



















		BUG_ON(folio_file_mapping(folio) != mapping);









		BUG_ON(folio->mapping != mapping);



















		if (!afs_dir_check_folio(dvnode, folio, req->actual_len)) {









			afs_dir_dump(dvnode, req);








@@ -474,6 +474,14 @@ static int afs_dir_iterate_block(struct afs_vnode *dvnode,







			continue;









		}



















		/* Don't expose silly rename entries to userspace. */









		if (nlen > 6 &&









		    dire->u.name[0] == '.' &&









		    ctx->actor != afs_lookup_filldir &&









		    ctx->actor != afs_lookup_one_filldir &&









		    memcmp(dire->u.name, ".__afs", 6) == 0)









			continue;



















		/* found the next entry */









		if (!dir_emit(ctx, dire->u.name, nlen,









			      ntohl(dire->u.vnode),








@@ -708,6 +716,8 @@ static void afs_do_lookup_success(struct afs_operation *op)







			break;









		}



















		if (vp->scb.status.abort_code)









			trace_afs_bulkstat_error(op, &vp->fid, i, vp->scb.status.abort_code);









		if (!vp->scb.have_status && !vp->scb.have_error)









			continue;


















@@ -897,13 +907,17 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,







		afs_begin_vnode_operation(op);









		afs_wait_for_operation(op);









	}









	inode = ERR_PTR(afs_op_error(op));



















out_op:









	if (!afs_op_error(op)) {









		if (op->file[1].scb.status.abort_code) {









			afs_op_accumulate_error(op, -ECONNABORTED,









						op->file[1].scb.status.abort_code);









		} else {









			inode = &op->file[1].vnode->netfs.inode;









			op->file[1].vnode = NULL;









		}









	}



















	if (op->file[0].scb.have_status)









		dentry->d_fsdata = (void *)(unsigned long)op->file[0].scb.status.data_version;








@@ -2022,7 +2036,7 @@ static bool afs_dir_release_folio(struct folio *folio, gfp_t gfp_flags)







{









	struct afs_vnode *dvnode = AFS_FS_I(folio_inode(folio));



















	_enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, folio_index(folio));









	_enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, folio->index);



















	folio_detach_private(folio);










































fs/afs/dynroot.c



+0
−9






























Original line number
Diff line number
Diff line







@@ -258,16 +258,7 @@ const struct inode_operations afs_dynroot_inode_operations = {







	.lookup		= afs_dynroot_lookup,









};



















/*









 * Dirs in the dynamic root don't need revalidation.









 */









static int afs_dynroot_d_revalidate(struct dentry *dentry, unsigned int flags)









{









	return 1;









}



















const struct dentry_operations afs_dynroot_dentry_operations = {









	.d_revalidate	= afs_dynroot_d_revalidate,









	.d_delete	= always_delete_dentry,









	.d_release	= afs_d_release,









	.d_automount	= afs_d_automount,
































fs/afs/proc.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -166,7 +166,7 @@ static int afs_proc_addr_prefs_show(struct seq_file *m, void *v)

















	if (!preflist) {









		seq_puts(m, "NO PREFS\n");









		return 0;









		goto out;









	}



















	seq_printf(m, "PROT SUBNET                                      PRIOR (v=%u n=%u/%u/%u)\n",








@@ -191,7 +191,8 @@ static int afs_proc_addr_prefs_show(struct seq_file *m, void *v)







		}









	}



















	rcu_read_lock();









out:









	rcu_read_unlock();









	return 0;









}










































fs/cachefiles/ondemand.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -539,6 +539,9 @@ int cachefiles_ondemand_init_object(struct cachefiles_object *object)







	struct fscache_volume *volume = object->volume->vcookie;









	size_t volume_key_size, cookie_key_size, data_len;



















	if (!object->ondemand)









		return 0;



















	/*









	 * CacheFiles will firstly check the cache file under the root cache









	 * directory. If the coherency check failed, it will fallback to