On Fri, Dec 04, 2020 at 12:10:25AM +0800, Gao Xiang wrote: > From: Dave Chinner <dchinner@xxxxxxxxxx> > > So xfs_ialloc() will only address in-core inode allocation then. > > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> > Signed-off-by: Gao Xiang <hsiangkao@xxxxxxxxxx> > --- > fs/xfs/xfs_inode.c | 200 +++++++++++++++------------------------------ > 1 file changed, 65 insertions(+), 135 deletions(-) > > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index 4ebfb1a18f0f..34eca1624397 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -761,68 +761,25 @@ xfs_inode_inherit_flags2( > } > > /* > - * Allocate an inode on disk and return a copy of its in-core version. > - * The in-core inode is locked exclusively. Set mode, nlink, and rdev > - * appropriately within the inode. The uid and gid for the inode are > - * set according to the contents of the given cred structure. > - * > - * Use xfs_dialloc() to allocate the on-disk inode. If xfs_dialloc() > - * has a free inode available, call xfs_iget() to obtain the in-core > - * version of the allocated inode. Finally, fill in the inode and > - * log its initial contents. In this case, ialloc_context would be > - * set to NULL. > - * > - * If xfs_dialloc() does not have an available inode, it will replenish > - * its supply by doing an allocation. Since we can only do one > - * allocation within a transaction without deadlocks, we must commit > - * the current transaction before returning the inode itself. > - * In this case, therefore, we will set ialloc_context and return. > - * The caller should then commit the current transaction, start a new > - * transaction, and call xfs_ialloc() again to actually get the inode. > - * > - * To ensure that some other process does not grab the inode that > - * was allocated during the first call to xfs_ialloc(), this routine > - * also returns the [locked] bp pointing to the head of the freelist > - * as ialloc_context. The caller should hold this buffer across > - * the commit and pass it back into this routine on the second call. > - * > - * If we are allocating quota inodes, we do not have a parent inode > - * to attach to or associate with (i.e. pip == NULL) because they > - * are not linked into the directory structure - they are attached > - * directly to the superblock - and so have no parent. > + * Initialise a newly allocated inode and return the in-core inode to the > + * caller locked exclusively. > */ > -static int > +static struct xfs_inode * > xfs_ialloc( Can we rename this xfs_dir_ialloc_init()? That way we keep everything in xfs_inode.c under the same namespace (xfs_dir_ialloc_*) and don't confuse it with functions in the xfs_ialloc_* namespace in fs/xfs/libxfs/xfs_ialloc*.c... Otherwise looks good. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx
