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: David 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: Christian Brauner <brauner@kernel.org>

diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index a386b4649f3e10e96683ddc36d5e48bd154c80c7..bf46485d12f816c11ce75cbafdcff19a1a96633f 100644 (file)
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -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);

diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c
index 71cce884e43457bc2985b9b03b91e09708d17025..53178bb2d1a6d31499e8233ad9b5b3d2a482e502 100644 (file)
--- a/fs/afs/dir_edit.c
+++ b/fs/afs/dir_edit.c
@@ -556,3 +556,52 @@ error:
                           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);
+}

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index cd2c4f85117d550a9faf943cb613adcd7737cf62..acae1b5bfc6348fca90a321174f4db7b925f64d0 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -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

diff --git a/include/trace/events/afs.h b/include/trace/events/afs.h
index cdb5f2af779926fca1d16c69285c8fa26ec85710..c52fd83ca9b7ccf8e9b5c0b1d00133677d58c8ef 100644 (file)
--- a/include/trace/events/afs.h
+++ b/include/trace/events/afs.h
@@ -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") \