2023-05-02 14:55:57

by Tom Rix

Subject: [PATCH] btrfs: replace else-statement with initialization

A small optimization
Move the default value of transid to its initialization
and remove the else-statement.

Signed-off-by: Tom Rix <[email protected]>
---
fs/btrfs/ioctl.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 25833b4eeaf5..4694301aa91e 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3132,14 +3132,13 @@ static noinline long btrfs_ioctl_start_sync(struct btrfs_root *root,
static noinline long btrfs_ioctl_wait_sync(struct btrfs_fs_info *fs_info,
void __user *argp)
{
- u64 transid;
+ u64 transid = 0; /* current trans */

if (argp) {
if (copy_from_user(&transid, argp, sizeof(transid)))
return -EFAULT;
- } else {
- transid = 0; /* current trans */
}
+
return btrfs_wait_for_commit(fs_info, transid);
}

--
2.27.0

2023-05-05 14:29:35

by David Sterba

Subject: Re: [PATCH] btrfs: replace else-statement with initialization

On Tue, May 02, 2023 at 10:51:29AM -0400, Tom Rix wrote:
> A small optimization
> Move the default value of transid to its initialization
> and remove the else-statement.
>
> Signed-off-by: Tom Rix <[email protected]>

Added to misc-next with minor updates, thanks.