| Message ID | 20250106095044.847334-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] xfs: mark xfs_dir_isempty static | expand |
On Mon, Jan 06, 2025 at 10:50:29AM +0100, Christoph Hellwig wrote: > And return bool instead of a boolean condition as int. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Nice and straightfoward, so Reviewed-by: "Darrick J. Wong" <djwong@kernel.org> --D > --- > fs/xfs/libxfs/xfs_dir2.c | 6 +++--- > fs/xfs/libxfs/xfs_dir2.h | 1 - > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c > index 202468223bf9..81aaef2f495e 100644 > --- a/fs/xfs/libxfs/xfs_dir2.c > +++ b/fs/xfs/libxfs/xfs_dir2.c > @@ -197,7 +197,7 @@ xfs_da_unmount( > /* > * Return 1 if directory contains only "." and "..". > */ > -int > +static bool > xfs_dir_isempty( > xfs_inode_t *dp) > { > @@ -205,9 +205,9 @@ xfs_dir_isempty( > > ASSERT(S_ISDIR(VFS_I(dp)->i_mode)); > if (dp->i_disk_size == 0) /* might happen during shutdown. */ > - return 1; > + return true; > if (dp->i_disk_size > xfs_inode_data_fork_size(dp)) > - return 0; > + return false; > sfp = dp->i_df.if_data; > return !sfp->count; > } > diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h > index 576068ed81fa..a6594a5a941d 100644 > --- a/fs/xfs/libxfs/xfs_dir2.h > +++ b/fs/xfs/libxfs/xfs_dir2.h > @@ -58,7 +58,6 @@ extern void xfs_dir_startup(void); > extern int xfs_da_mount(struct xfs_mount *mp); > extern void xfs_da_unmount(struct xfs_mount *mp); > > -extern int xfs_dir_isempty(struct xfs_inode *dp); > extern int xfs_dir_init(struct xfs_trans *tp, struct xfs_inode *dp, > struct xfs_inode *pdp); > extern int xfs_dir_createname(struct xfs_trans *tp, struct xfs_inode *dp, > -- > 2.45.2 > >
diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 202468223bf9..81aaef2f495e 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -197,7 +197,7 @@ xfs_da_unmount( /* * Return 1 if directory contains only "." and "..". */ -int +static bool xfs_dir_isempty( xfs_inode_t *dp) { @@ -205,9 +205,9 @@ xfs_dir_isempty( ASSERT(S_ISDIR(VFS_I(dp)->i_mode)); if (dp->i_disk_size == 0) /* might happen during shutdown. */ - return 1; + return true; if (dp->i_disk_size > xfs_inode_data_fork_size(dp)) - return 0; + return false; sfp = dp->i_df.if_data; return !sfp->count; } diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h index 576068ed81fa..a6594a5a941d 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h @@ -58,7 +58,6 @@ extern void xfs_dir_startup(void); extern int xfs_da_mount(struct xfs_mount *mp); extern void xfs_da_unmount(struct xfs_mount *mp); -extern int xfs_dir_isempty(struct xfs_inode *dp); extern int xfs_dir_init(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_inode *pdp); extern int xfs_dir_createname(struct xfs_trans *tp, struct xfs_inode *dp,
And return bool instead of a boolean condition as int. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/libxfs/xfs_dir2.c | 6 +++--- fs/xfs/libxfs/xfs_dir2.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)