* Initialise a newly allocated inode and return the in-core inode to the
* caller locked exclusively.
*/
-static int
+int
libxfs_icreate(
struct xfs_trans *tp,
xfs_ino_t ino,
return 0;
}
-/*
- * Wrapper around call to libxfs_ialloc. Takes care of committing and
- * allocating a new transaction as needed.
- *
- * Originally there were two copies of this code - one in mkfs, the
- * other in repair - now there is just the one.
- */
-int
-libxfs_dir_ialloc(
- struct xfs_trans **tpp,
- struct xfs_inode *dp,
- mode_t mode,
- nlink_t nlink,
- xfs_dev_t rdev,
- struct cred *cr,
- struct fsxattr *fsx,
- struct xfs_inode **ipp)
-{
- struct xfs_icreate_args args = {
- .pip = dp,
- .mode = mode,
- };
- struct xfs_inode *ip;
- struct inode *inode;
- xfs_ino_t parent_ino = dp ? dp->i_ino : 0;
- xfs_ino_t ino;
- int error;
-
- if (dp && xfs_has_parent(dp->i_mount))
- args.flags |= XFS_ICREATE_INIT_XATTRS;
-
- /* Only devices get rdev numbers */
- switch (mode & S_IFMT) {
- case S_IFCHR:
- case S_IFBLK:
- args.rdev = rdev;
- break;
- }
-
- /*
- * Call the space management code to pick the on-disk inode to be
- * allocated.
- */
- error = xfs_dialloc(tpp, parent_ino, mode, &ino);
- if (error)
- return error;
-
- error = libxfs_icreate(*tpp, ino, &args, &ip);
- if (error)
- return error;
-
- inode = VFS_I(ip);
- i_uid_write(inode, cr->cr_uid);
- if (cr->cr_flags & CRED_FORCE_GID)
- i_gid_write(inode, cr->cr_gid);
- set_nlink(inode, nlink);
-
- /* If there is no parent dir, initialize the file from fsxattr data. */
- if (dp == NULL) {
- ip->i_projid = fsx->fsx_projid;
- ip->i_extsize = fsx->fsx_extsize;
- ip->i_diflags = xfs_flags2diflags(ip, fsx->fsx_xflags);
-
- if (xfs_has_v3inodes(ip->i_mount)) {
- ip->i_diflags2 = xfs_flags2diflags2(ip,
- fsx->fsx_xflags);
- ip->i_cowextsize = fsx->fsx_cowextsize;
- }
- }
-
- xfs_trans_log_inode(*tpp, ip, XFS_ILOG_CORE);
- *ipp = ip;
- return 0;
-}
-
/*
* Inode cache stubs.
*/
return ret;
}
+struct cred {
+ uid_t cr_uid;
+ gid_t cr_gid;
+};
+
+static int
+creatproto(
+ struct xfs_trans **tpp,
+ struct xfs_inode *dp,
+ mode_t mode,
+ xfs_dev_t rdev,
+ struct cred *cr,
+ struct fsxattr *fsx,
+ struct xfs_inode **ipp)
+{
+ struct xfs_icreate_args args = {
+ .idmap = libxfs_nop_idmap,
+ .pip = dp,
+ .rdev = rdev,
+ .mode = mode,
+ };
+ struct xfs_inode *ip;
+ struct inode *inode;
+ xfs_ino_t parent_ino = dp ? dp->i_ino : 0;
+ xfs_ino_t ino;
+ int error;
+
+ if (dp && xfs_has_parent(dp->i_mount))
+ args.flags |= XFS_ICREATE_INIT_XATTRS;
+
+ /*
+ * Call the space management code to pick the on-disk inode to be
+ * allocated.
+ */
+ error = -libxfs_dialloc(tpp, parent_ino, mode, &ino);
+ if (error)
+ return error;
+
+ error = -libxfs_icreate(*tpp, ino, &args, &ip);
+ if (error)
+ return error;
+
+ inode = VFS_I(ip);
+ i_uid_write(inode, cr->cr_uid);
+ i_gid_write(inode, cr->cr_gid);
+
+ /* If there is no parent dir, initialize the file from fsxattr data. */
+ if (dp == NULL) {
+ ip->i_projid = fsx->fsx_projid;
+ ip->i_extsize = fsx->fsx_extsize;
+ ip->i_diflags = xfs_flags2diflags(ip, fsx->fsx_xflags);
+
+ if (xfs_has_v3inodes(ip->i_mount)) {
+ ip->i_diflags2 = xfs_flags2diflags2(ip,
+ fsx->fsx_xflags);
+ ip->i_cowextsize = fsx->fsx_cowextsize;
+ }
+ }
+
+ libxfs_trans_log_inode(*tpp, ip, XFS_ILOG_CORE);
+ *ipp = ip;
+ return 0;
+}
+
static void
parseproto(
xfs_mount_t *mp,
mode |= val;
creds.cr_uid = (int)getnum(getstr(pp), 0, 0, false);
creds.cr_gid = (int)getnum(getstr(pp), 0, 0, false);
- creds.cr_flags = CRED_FORCE_GID;
xname.name = (unsigned char *)name;
xname.len = name ? strlen(name) : 0;
xname.type = 0;
buf = newregfile(pp, &len);
tp = getres(mp, XFS_B_TO_FSB(mp, len));
ppargs = newpptr(mp);
- error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFREG, 1, 0,
- &creds, fsxp, &ip);
+ error = creatproto(&tp, pip, mode | S_IFREG, 0, &creds, fsxp,
+ &ip);
if (error)
fail(_("Inode allocation failed"), error);
writefile(tp, ip, buf, len);
}
tp = getres(mp, XFS_B_TO_FSB(mp, llen));
ppargs = newpptr(mp);
- error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFREG, 1, 0,
- &creds, fsxp, &ip);
+ error = creatproto(&tp, pip, mode | S_IFREG, 0, &creds, fsxp,
+ &ip);
if (error)
fail(_("Inode pre-allocation failed"), error);
ppargs = newpptr(mp);
majdev = getnum(getstr(pp), 0, 0, false);
mindev = getnum(getstr(pp), 0, 0, false);
- error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFBLK, 1,
+ error = creatproto(&tp, pip, mode | S_IFBLK,
IRIX_MKDEV(majdev, mindev), &creds, fsxp, &ip);
if (error) {
fail(_("Inode allocation failed"), error);
ppargs = newpptr(mp);
majdev = getnum(getstr(pp), 0, 0, false);
mindev = getnum(getstr(pp), 0, 0, false);
- error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFCHR, 1,
+ error = creatproto(&tp, pip, mode | S_IFCHR,
IRIX_MKDEV(majdev, mindev), &creds, fsxp, &ip);
if (error)
fail(_("Inode allocation failed"), error);
case IF_FIFO:
tp = getres(mp, 0);
ppargs = newpptr(mp);
- error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFIFO, 1, 0,
- &creds, fsxp, &ip);
+ error = creatproto(&tp, pip, mode | S_IFIFO, 0, &creds, fsxp,
+ &ip);
if (error)
fail(_("Inode allocation failed"), error);
libxfs_trans_ijoin(tp, pip, 0);
len = (int)strlen(buf);
tp = getres(mp, XFS_B_TO_FSB(mp, len));
ppargs = newpptr(mp);
- error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFLNK, 1, 0,
- &creds, fsxp, &ip);
+ error = creatproto(&tp, pip, mode | S_IFLNK, 0, &creds, fsxp,
+ &ip);
if (error)
fail(_("Inode allocation failed"), error);
writesymlink(tp, ip, buf, len);
break;
case IF_DIRECTORY:
tp = getres(mp, 0);
- error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFDIR, 1, 0,
- &creds, fsxp, &ip);
+ error = creatproto(&tp, pip, mode | S_IFDIR, 0, &creds, fsxp,
+ &ip);
if (error)
fail(_("Inode allocation failed"), error);
- libxfs_bumplink(tp, ip); /* account for . */
if (!pip) {
pip = ip;
mp->m_sb.sb_rootino = ip->i_ino;
memset(&creds, 0, sizeof(creds));
memset(&fsxattrs, 0, sizeof(fsxattrs));
- error = -libxfs_dir_ialloc(&tp, NULL, S_IFREG, 1, 0,
- &creds, &fsxattrs, &rbmip);
+ error = creatproto(&tp, NULL, S_IFREG, 0, &creds, &fsxattrs, &rbmip);
if (error) {
fail(_("Realtime bitmap inode allocation failed"), error);
}
/*
* Do our thing with rbmip before allocating rsumip,
- * because the next call to ialloc() may
+ * because the next call to createproto may
* commit the transaction in which rbmip was allocated.
*/
mp->m_sb.sb_rbmino = rbmip->i_ino;
libxfs_trans_log_inode(tp, rbmip, XFS_ILOG_CORE);
libxfs_log_sb(tp);
mp->m_rbmip = rbmip;
- error = -libxfs_dir_ialloc(&tp, NULL, S_IFREG, 1, 0,
- &creds, &fsxattrs, &rsumip);
+ error = creatproto(&tp, NULL, S_IFREG, 0, &creds, &fsxattrs, &rsumip);
if (error) {
fail(_("Realtime summary inode allocation failed"), error);
}
#include "versions.h"
#include "repair/pptr.h"
-static struct cred zerocr;
-static struct fsxattr zerofsx;
static xfs_ino_t orphanage_ino;
/*
* orphanage name == lost+found
*/
static xfs_ino_t
-mk_orphanage(xfs_mount_t *mp)
+mk_orphanage(
+ struct xfs_mount *mp)
{
- xfs_ino_t ino;
- xfs_trans_t *tp;
- xfs_inode_t *ip;
- xfs_inode_t *pip;
- ino_tree_node_t *irec;
- int ino_offset = 0;
- int i;
- int error;
- const int mode = 0755;
- int nres;
- struct xfs_name xname;
- struct xfs_parent_args *ppargs = NULL;
+ struct xfs_icreate_args args = {
+ .idmap = libxfs_nop_idmap,
+ .mode = S_IFDIR | 0755,
+ };
+ struct xfs_trans *tp;
+ struct xfs_inode *ip;
+ struct xfs_inode *pip;
+ struct ino_tree_node *irec;
+ xfs_ino_t ino;
+ int ino_offset = 0;
+ int i;
+ int error;
+ int nres;
+ struct xfs_name xname;
+ struct xfs_parent_args *ppargs = NULL;
+
+ if (xfs_has_parent(mp))
+ args.flags |= XFS_ICREATE_INIT_XATTRS;
i = -libxfs_parent_start(mp, &ppargs);
if (i)
do_error(_("%d - couldn't iget root inode to obtain %s\n"),
i, ORPHANAGE);
+ args.pip = pip;
xname.name = (unsigned char *)ORPHANAGE;
xname.len = strlen(ORPHANAGE);
xname.type = XFS_DIR3_FT_DIR;
if (i)
res_failed(i);
- /*
- * use iget/ijoin instead of trans_iget because the ialloc
- * wrapper can commit the transaction and start a new one
- */
-/* i = -libxfs_iget(mp, NULL, mp->m_sb.sb_rootino, 0, &pip);
- if (i)
- do_error(_("%d - couldn't iget root inode to make %s\n"),
- i, ORPHANAGE);*/
-
- error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFDIR,
- 1, 0, &zerocr, &zerofsx, &ip);
- if (error) {
+ error = -libxfs_dialloc(&tp, mp->m_sb.sb_rootino, args.mode, &ino);
+ if (error)
do_error(_("%s inode allocation failed %d\n"),
ORPHANAGE, error);
- }
- libxfs_bumplink(tp, ip); /* account for . */
- ino = ip->i_ino;
+
+ error = -libxfs_icreate(tp, ino, &args, &ip);
+ if (error)
+ do_error(_("%s inode initialization failed %d\n"),
+ ORPHANAGE, error);
irec = find_inode_rec(mp,
XFS_INO_TO_AGNO(mp, ino),
parent_ptr_init(mp);
- memset(&zerocr, 0, sizeof(struct cred));
- memset(&zerofsx, 0, sizeof(struct fsxattr));
orphanage_ino = 0;
do_log(_("Phase 6 - check inode connectivity...\n"));
projects / users / hch / xfsprogs.git / commitdiff