| Message ID | 20210726185107.6842-1-mpdesouza@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: file-item: Remove unneeded variable | expand |
On Mon, Jul 26, 2021 at 03:51:07PM -0300, Marcos Paulo de Souza wrote: > We can return from btrfs_search_slot directly. > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> > --- > fs/btrfs/file-item.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c > index df6631eefc65..99ca5724ac6f 100644 > --- a/fs/btrfs/file-item.c > +++ b/fs/btrfs/file-item.c > @@ -233,7 +233,6 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, > struct btrfs_path *path, u64 objectid, > u64 offset, int mod) > { > - int ret; > struct btrfs_key file_key; > int ins_len = mod < 0 ? -1 : 0; > int cow = mod != 0; > @@ -241,8 +240,7 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, > file_key.objectid = objectid; > file_key.offset = offset; > file_key.type = BTRFS_EXTENT_DATA_KEY; > - ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow); > - return ret; > + return btrfs_search_slot(trans, root, &file_key, path, ins_len, cow); Here it makes sense to do the return as it means the return value convention of btrfs_search_slot also applies. I've updated changelog and subject to reflect this. Added to misc-next, thanks.
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index df6631eefc65..99ca5724ac6f 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -233,7 +233,6 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, struct btrfs_path *path, u64 objectid, u64 offset, int mod) { - int ret; struct btrfs_key file_key; int ins_len = mod < 0 ? -1 : 0; int cow = mod != 0; @@ -241,8 +240,7 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, file_key.objectid = objectid; file_key.offset = offset; file_key.type = BTRFS_EXTENT_DATA_KEY; - ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow); - return ret; + return btrfs_search_slot(trans, root, &file_key, path, ins_len, cow); } /*
We can return from btrfs_search_slot directly. Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> --- fs/btrfs/file-item.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)