| Message ID | 20240118080326.13137-3-sshegde@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | remove duplicate ifdefs | expand |
On Thu, Jan 18, 2024 at 01:33:25PM +0530, Shrikanth Hegde wrote: > when a ifdef is used in the below manner, second one could be considered as > duplicate. > > ifdef DEFINE_A > ...code block... > ifdef DEFINE_A > ...code block... > endif > ...code block... > endif > > There are few places in fs code where above pattern was seen. > No functional change is intended here. It only aims to improve code > readability. > > Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com> > --- > fs/ntfs/inode.c | 2 -- > fs/xfs/xfs_sysfs.c | 4 ---- > 2 files changed, 6 deletions(-) > > diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c > index aba1e22db4e9..d2c8622d53d1 100644 > --- a/fs/ntfs/inode.c > +++ b/fs/ntfs/inode.c > @@ -2859,11 +2859,9 @@ int ntfs_truncate(struct inode *vi) > * > * See ntfs_truncate() description above for details. > */ > -#ifdef NTFS_RW > void ntfs_truncate_vfs(struct inode *vi) { > ntfs_truncate(vi); > } > -#endif > > /** > * ntfs_setattr - called from notify_change() when an attribute is being changed > diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c > index 17485666b672..d2391eec37fe 100644 > --- a/fs/xfs/xfs_sysfs.c > +++ b/fs/xfs/xfs_sysfs.c > @@ -193,7 +193,6 @@ always_cow_show( > } > XFS_SYSFS_ATTR_RW(always_cow); > > -#ifdef DEBUG > /* > * Override how many threads the parallel work queue is allowed to create. > * This has to be a debug-only global (instead of an errortag) because one of > @@ -260,7 +259,6 @@ larp_show( > return snprintf(buf, PAGE_SIZE, "%d\n", xfs_globals.larp); > } > XFS_SYSFS_ATTR_RW(larp); > -#endif /* DEBUG */ > > STATIC ssize_t > bload_leaf_slack_store( > @@ -319,10 +317,8 @@ static struct attribute *xfs_dbg_attrs[] = { > ATTR_LIST(log_recovery_delay), > ATTR_LIST(mount_delay), > ATTR_LIST(always_cow), > -#ifdef DEBUG > ATTR_LIST(pwork_threads), > ATTR_LIST(larp), > -#endif The xfs part seems fine to me bcause I think some bot already complained about this... Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > ATTR_LIST(bload_leaf_slack), > ATTR_LIST(bload_node_slack), > NULL, > -- > 2.39.3 > >
On Thu, Jan 18, 2024 at 01:33:25 PM +0530, Shrikanth Hegde wrote: > when a ifdef is used in the below manner, second one could be considered as > duplicate. > > ifdef DEFINE_A > ...code block... > ifdef DEFINE_A > ...code block... > endif > ...code block... > endif > > There are few places in fs code where above pattern was seen. > No functional change is intended here. It only aims to improve code > readability. > Can you please post the xfs changes as a separate patch along with Darrick's RVB tag? This will make it easy for me to apply the resulting patch to the XFS tree.
On 1/22/24 6:20 PM, Chandan Babu R wrote: > On Thu, Jan 18, 2024 at 01:33:25 PM +0530, Shrikanth Hegde wrote: >> when a ifdef is used in the below manner, second one could be considered as >> duplicate. >> >> ifdef DEFINE_A >> ...code block... >> ifdef DEFINE_A >> ...code block... >> endif >> ...code block... >> endif >> >> There are few places in fs code where above pattern was seen. >> No functional change is intended here. It only aims to improve code >> readability. >> > > Can you please post the xfs changes as a separate patch along with Darrick's > RVB tag? This will make it easy for me to apply the resulting patch to the XFS > tree. Ok. will split the fs patches into two and send v2 soon. Thanks. >
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index aba1e22db4e9..d2c8622d53d1 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c @@ -2859,11 +2859,9 @@ int ntfs_truncate(struct inode *vi) * * See ntfs_truncate() description above for details. */ -#ifdef NTFS_RW void ntfs_truncate_vfs(struct inode *vi) { ntfs_truncate(vi); } -#endif /** * ntfs_setattr - called from notify_change() when an attribute is being changed diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c index 17485666b672..d2391eec37fe 100644 --- a/fs/xfs/xfs_sysfs.c +++ b/fs/xfs/xfs_sysfs.c @@ -193,7 +193,6 @@ always_cow_show( } XFS_SYSFS_ATTR_RW(always_cow); -#ifdef DEBUG /* * Override how many threads the parallel work queue is allowed to create. * This has to be a debug-only global (instead of an errortag) because one of @@ -260,7 +259,6 @@ larp_show( return snprintf(buf, PAGE_SIZE, "%d\n", xfs_globals.larp); } XFS_SYSFS_ATTR_RW(larp); -#endif /* DEBUG */ STATIC ssize_t bload_leaf_slack_store( @@ -319,10 +317,8 @@ static struct attribute *xfs_dbg_attrs[] = { ATTR_LIST(log_recovery_delay), ATTR_LIST(mount_delay), ATTR_LIST(always_cow), -#ifdef DEBUG ATTR_LIST(pwork_threads), ATTR_LIST(larp), -#endif ATTR_LIST(bload_leaf_slack), ATTR_LIST(bload_node_slack), NULL,
when a ifdef is used in the below manner, second one could be considered as duplicate. ifdef DEFINE_A ...code block... ifdef DEFINE_A ...code block... endif ...code block... endif There are few places in fs code where above pattern was seen. No functional change is intended here. It only aims to improve code readability. Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com> --- fs/ntfs/inode.c | 2 -- fs/xfs/xfs_sysfs.c | 4 ---- 2 files changed, 6 deletions(-) -- 2.39.3