Message ID | 172783103061.4038482.13766864255481933120.stgit@frogsfrogsfrogs (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Series | [1/4] xfs_db: port the unlink command to use libxfs_droplink | expand |
On Tue, Oct 01, 2024 at 06:25:00PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Source kernel commit: b11b11e3b7a72606cfef527255a9467537bcaaa5 How is this a source kernel commit when it purely touched non-libxfs code? The code changes themselves look good, though: Reviewed-by: Christoph Hellwig <hch@lst.de>
On Tue, Oct 01, 2024 at 10:53:14PM -0700, Christoph Hellwig wrote: > On Tue, Oct 01, 2024 at 06:25:00PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong <djwong@kernel.org> > > > > Source kernel commit: b11b11e3b7a72606cfef527255a9467537bcaaa5 > > How is this a source kernel commit when it purely touched non-libxfs > code? scripts gone wild :( Turns out that editing these free-form commit messages with computer programs is a bit fraught. > The code changes themselves look good, though: > > Reviewed-by: Christoph Hellwig <hch@lst.de> Thanks! --D
On 2024-10-02 15:50:29, Darrick J. Wong wrote: > On Tue, Oct 01, 2024 at 10:53:14PM -0700, Christoph Hellwig wrote: > > On Tue, Oct 01, 2024 at 06:25:00PM -0700, Darrick J. Wong wrote: > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > Source kernel commit: b11b11e3b7a72606cfef527255a9467537bcaaa5 > > > > How is this a source kernel commit when it purely touched non-libxfs > > code? > > scripts gone wild :( I will drop it then when merging
diff --git a/db/iunlink.c b/db/iunlink.c index fcc824d9a..2ca9096f1 100644 --- a/db/iunlink.c +++ b/db/iunlink.c @@ -315,7 +315,7 @@ create_unlinked( struct xfs_icreate_args args = { .idmap = libxfs_nop_idmap, .mode = S_IFREG | 0600, - .flags = XFS_ICREATE_TMPFILE, + .flags = XFS_ICREATE_TMPFILE | XFS_ICREATE_UNLINKABLE, }; struct xfs_inode *ip; struct xfs_trans *tp; diff --git a/mkfs/proto.c b/mkfs/proto.c index 96cb9f854..251e3a9ee 100644 --- a/mkfs/proto.c +++ b/mkfs/proto.c @@ -432,8 +432,9 @@ creatproto( xfs_ino_t ino; int error; - if (dp && xfs_has_parent(dp->i_mount)) - args.flags |= XFS_ICREATE_INIT_XATTRS; + /* Root directories cannot be linked to a parent. */ + if (!dp) + args.flags |= XFS_ICREATE_UNLINKABLE; /* * Call the space management code to pick the on-disk inode to be diff --git a/repair/phase6.c b/repair/phase6.c index 52e42d4c0..85f122ec7 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -909,9 +909,6 @@ mk_orphanage( 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 allocate parent pointer for %s\n"),