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

Merge tag 'afs-next-20221222' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs 

Pull afs update from David Howells:
 "A fix for a couple of missing resource counter decrements, two small
  cleanups of now-unused bits of code and a patch to remove writepage
  support from afs"

* tag 'afs-next-20221222' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  afs: Stop implementing ->writepage()
  afs: remove afs_cache_netfs and afs_zap_permits() declarations
  afs: remove variable nr_servers
  afs: Fix lost servers_outstanding count
parents d1ac1a2b a9eb558a

fs/afs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ const struct address_space_operations afs_dir_aops = { 
	.dirty_folio	= afs_dir_dirty_folio,

	.release_folio	= afs_dir_release_folio,

	.invalidate_folio = afs_dir_invalidate_folio,

	.migrate_folio	= filemap_migrate_folio,

};



const struct dentry_operations afs_fs_dentry_operations = {

fs/afs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -58,14 +58,15 @@ const struct address_space_operations afs_file_aops = { 
	.invalidate_folio = afs_invalidate_folio,

	.write_begin	= afs_write_begin,

	.write_end	= afs_write_end,

	.writepage	= afs_writepage,

	.writepages	= afs_writepages,

	.migrate_folio	= filemap_migrate_folio,

};



const struct address_space_operations afs_symlink_aops = {

	.read_folio	= afs_symlink_read_folio,

	.release_folio	= afs_release_folio,

	.invalidate_folio = afs_invalidate_folio,

	.migrate_folio	= filemap_migrate_folio,

};



static const struct vm_operations_struct afs_vm_ops = {

fs/afs/fs_probe.c

+4 −1
Original line number Diff line number Diff line
@@ -366,12 +366,15 @@ void afs_fs_probe_dispatcher(struct work_struct *work) 
	unsigned long nowj, timer_at, poll_at;

	bool first_pass = true, set_timer = false;



	if (!net->live)

	if (!net->live) {

		afs_dec_servers_outstanding(net);

		return;

	}



	_enter("");



	if (list_empty(&net->fs_probe_fast) && list_empty(&net->fs_probe_slow)) {

		afs_dec_servers_outstanding(net);

		_leave(" [none]");

		return;

	}

fs/afs/internal.h

+0 −8
Original line number Diff line number Diff line
@@ -971,13 +971,6 @@ extern int afs_end_cursor(struct afs_addr_cursor *); 
extern void afs_merge_fs_addr4(struct afs_addr_list *, __be32, u16);

extern void afs_merge_fs_addr6(struct afs_addr_list *, __be32 *, u16);



/*

 * cache.c

 */

#ifdef CONFIG_AFS_FSCACHE

extern struct fscache_netfs afs_cache_netfs;

#endif



/*

 * callback.c

 */
@@ -1391,7 +1384,6 @@ extern void afs_put_permits(struct afs_permits *); 
extern void afs_clear_permits(struct afs_vnode *);

extern void afs_cache_permit(struct afs_vnode *, struct key *, unsigned int,

			     struct afs_status_cb *);

extern void afs_zap_permits(struct rcu_head *);

extern struct key *afs_request_key(struct afs_cell *);

extern struct key *afs_request_key_rcu(struct afs_cell *);

extern int afs_check_permit(struct afs_vnode *, struct key *, afs_access_t *);

fs/afs/volume.c

+1 −5
Original line number Diff line number Diff line
@@ -70,11 +70,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_fs_context *params, 
{

	struct afs_server_list *slist;

	struct afs_volume *volume;

	int ret = -ENOMEM, nr_servers = 0, i;



	for (i = 0; i < vldb->nr_servers; i++)

		if (vldb->fs_mask[i] & type_mask)

			nr_servers++;

	int ret = -ENOMEM;



	volume = kzalloc(sizeof(struct afs_volume), GFP_KERNEL);

	if (!volume)