Unverified Commit 836bb70b authored by David Howells's avatar David Howells Committed by Christian Brauner
Browse files

afs: Make afs_mkdir() locally initialise a new directory's content 



Initialise a new directory's content when it is created by mkdir locally
rather than downloading the content from the server as we can predict what
it's going to look like.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20241216204124.3752367-29-dhowells@redhat.com


cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent e2d46f2e

fs/afs/dir.c

+3 −0
Original line number Diff line number Diff line
@@ -1264,6 +1264,7 @@ void afs_check_for_remote_deletion(struct afs_operation *op) 
 */

static void afs_vnode_new_inode(struct afs_operation *op)

{

	struct afs_vnode_param *dvp = &op->file[0];

	struct afs_vnode_param *vp = &op->file[1];

	struct afs_vnode *vnode;

	struct inode *inode;
@@ -1283,6 +1284,8 @@ static void afs_vnode_new_inode(struct afs_operation *op) 


	vnode = AFS_FS_I(inode);

	set_bit(AFS_VNODE_NEW_CONTENT, &vnode->flags);

	if (S_ISDIR(inode->i_mode))

		afs_mkdir_init_dir(vnode, dvp->vnode);

	if (!afs_op_error(op))

		afs_cache_permit(vnode, op->key, vnode->cb_break, &vp->scb);

	d_instantiate(op->dentry, inode);

fs/afs/dir_edit.c

+49 −0
Original line number Diff line number Diff line
@@ -556,3 +556,52 @@ void afs_edit_dir_update_dotdot(struct afs_vnode *vnode, struct afs_vnode *new_d 
			   0, 0, 0, 0, "..");

	goto out;

}



/*

 * Initialise a new directory.  We need to fill in the "." and ".." entries.

 */

void afs_mkdir_init_dir(struct afs_vnode *dvnode, struct afs_vnode *parent_dvnode)

{

	union afs_xdr_dir_block *meta;

	struct afs_dir_iter iter = { .dvnode = dvnode };

	union afs_xdr_dirent *de;

	unsigned int slot = AFS_DIR_RESV_BLOCKS0;

	loff_t i_size;



	i_size = i_size_read(&dvnode->netfs.inode);

	if (i_size != AFS_DIR_BLOCK_SIZE) {

		afs_invalidate_dir(dvnode, afs_dir_invalid_edit_add_bad_size);

		return;

	}



	meta = afs_dir_get_block(&iter, 0);

	if (!meta)

		return;



	afs_edit_init_block(meta, meta, 0);



	de = &meta->dirents[slot];

	de->u.valid  = 1;

	de->u.vnode  = htonl(dvnode->fid.vnode);

	de->u.unique = htonl(dvnode->fid.unique);

	memcpy(de->u.name, ".", 2);

	trace_afs_edit_dir(dvnode, afs_edit_dir_for_mkdir, afs_edit_dir_mkdir, 0, slot,

			   dvnode->fid.vnode, dvnode->fid.unique, ".");

	slot++;



	de = &meta->dirents[slot];

	de->u.valid  = 1;

	de->u.vnode  = htonl(parent_dvnode->fid.vnode);

	de->u.unique = htonl(parent_dvnode->fid.unique);

	memcpy(de->u.name, "..", 3);

	trace_afs_edit_dir(dvnode, afs_edit_dir_for_mkdir, afs_edit_dir_mkdir, 0, slot,

			   parent_dvnode->fid.vnode, parent_dvnode->fid.unique, "..");



	afs_set_contig_bits(meta, AFS_DIR_RESV_BLOCKS0, 2);

	meta->meta.alloc_ctrs[0] -= 2;

	kunmap_local(meta);



	netfs_single_mark_inode_dirty(&dvnode->netfs.inode);

	set_bit(AFS_VNODE_DIR_VALID, &dvnode->flags);

	set_bit(AFS_VNODE_DIR_READ, &dvnode->flags);

}

fs/afs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -1078,6 +1078,7 @@ extern void afs_edit_dir_add(struct afs_vnode *, struct qstr *, struct afs_fid * 
extern void afs_edit_dir_remove(struct afs_vnode *, struct qstr *, enum afs_edit_dir_reason);

void afs_edit_dir_update_dotdot(struct afs_vnode *vnode, struct afs_vnode *new_dvnode,

				enum afs_edit_dir_reason why);

void afs_mkdir_init_dir(struct afs_vnode *dvnode, struct afs_vnode *parent_vnode);



/*

 * dir_silly.c

include/trace/events/afs.h

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ enum yfs_cm_operation { 
	EM(afs_dir_invalid_edit_add_no_slots,	"edit-add-no-slots") \

	EM(afs_dir_invalid_edit_add_too_many_blocks, "edit-add-too-many-blocks") \

	EM(afs_dir_invalid_edit_get_block,	"edit-get-block") \

	EM(afs_dir_invalid_edit_mkdir,		"edit-mkdir") \

	EM(afs_dir_invalid_edit_rem_bad_size,	"edit-rem-bad-size") \

	EM(afs_dir_invalid_edit_rem_wrong_name,	"edit-rem-wrong_name") \

	EM(afs_dir_invalid_edit_upd_bad_size,	"edit-upd-bad-size") \
@@ -371,6 +372,7 @@ enum yfs_cm_operation { 
	EM(afs_edit_dir_delete_error,		"d_err ") \

	EM(afs_edit_dir_delete_inval,		"d_invl") \

	EM(afs_edit_dir_delete_noent,		"d_nent") \

	EM(afs_edit_dir_mkdir,			"mk_ent") \

	EM(afs_edit_dir_update_dd,		"u_ddot") \

	EM(afs_edit_dir_update_error,		"u_fail") \

	EM(afs_edit_dir_update_inval,		"u_invl") \