2016-08-15 19:09:15

by Ross Zwisler

Subject: [PATCH 4/7] dax: rename 'ret' to 'entry' in grab_mapping_entry

No functional change.

Everywhere else that we get entries via get_unlocked_mapping_entry(), we
save it in 'entry' variables. Just change this to be more descriptive.

Signed-off-by: Ross Zwisler <ross.zwisler-VuQAYsv1563Yd54FQh9/[email protected]>
---
fs/dax.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fs/dax.c b/fs/dax.c
index 8030f93..fed6a52 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -394,13 +394,13 @@ static void *get_unlocked_mapping_entry(struct address_space *mapping,
*/
static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index)
{
- void *ret, **slot;
+ void *entry, **slot;

restart:
spin_lock_irq(&mapping->tree_lock);
- ret = get_unlocked_mapping_entry(mapping, index, &slot);
+ entry = get_unlocked_mapping_entry(mapping, index, &slot);
/* No entry for given index? Make sure radix tree is big enough. */
- if (!ret) {
+ if (!entry) {
int err;

spin_unlock_irq(&mapping->tree_lock);
@@ -408,10 +408,10 @@ restart:
mapping_gfp_mask(mapping) & ~__GFP_HIGHMEM);
if (err)
return ERR_PTR(err);
- ret = (void *)(RADIX_TREE_EXCEPTIONAL_ENTRY |
+ entry = (void *)(RADIX_TREE_EXCEPTIONAL_ENTRY |
RADIX_DAX_ENTRY_LOCK);
spin_lock_irq(&mapping->tree_lock);
- err = radix_tree_insert(&mapping->page_tree, index, ret);
+ err = radix_tree_insert(&mapping->page_tree, index, entry);
radix_tree_preload_end();
if (err) {
spin_unlock_irq(&mapping->tree_lock);
@@ -423,11 +423,11 @@ restart:
/* Good, we have inserted empty locked entry into the tree. */
mapping->nrexceptional++;
spin_unlock_irq(&mapping->tree_lock);
- return ret;
+ return entry;
}
/* Normal page in radix tree? */
- if (!radix_tree_exceptional_entry(ret)) {
- struct page *page = ret;
+ if (!radix_tree_exceptional_entry(entry)) {
+ struct page *page = entry;

get_page(page);
spin_unlock_irq(&mapping->tree_lock);
@@ -440,9 +440,9 @@ restart:
}
return page;
}
- ret = lock_slot(mapping, slot);
+ entry = lock_slot(mapping, slot);
spin_unlock_irq(&mapping->tree_lock);
- return ret;
+ return entry;
}

void dax_wake_mapping_entry_waiter(struct address_space *mapping,
--
2.9.0

2016-08-16 09:14:50

by Jan Kara

Subject: Re: [PATCH 4/7] dax: rename 'ret' to 'entry' in grab_mapping_entry

On Mon 15-08-16 13:09:15, Ross Zwisler wrote:
> No functional change.
>
> Everywhere else that we get entries via get_unlocked_mapping_entry(), we
> save it in 'entry' variables. Just change this to be more descriptive.
>
> Signed-off-by: Ross Zwisler <[email protected]>

Looks good. You can add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/dax.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/fs/dax.c b/fs/dax.c
> index 8030f93..fed6a52 100644
> --- a/fs/dax.c
> +++ b/fs/dax.c
> @@ -394,13 +394,13 @@ static void *get_unlocked_mapping_entry(struct address_space *mapping,
> */
> static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index)
> {
> - void *ret, **slot;
> + void *entry, **slot;
>
> restart:
> spin_lock_irq(&mapping->tree_lock);
> - ret = get_unlocked_mapping_entry(mapping, index, &slot);
> + entry = get_unlocked_mapping_entry(mapping, index, &slot);
> /* No entry for given index? Make sure radix tree is big enough. */
> - if (!ret) {
> + if (!entry) {
> int err;
>
> spin_unlock_irq(&mapping->tree_lock);
> @@ -408,10 +408,10 @@ restart:
> mapping_gfp_mask(mapping) & ~__GFP_HIGHMEM);
> if (err)
> return ERR_PTR(err);
> - ret = (void *)(RADIX_TREE_EXCEPTIONAL_ENTRY |
> + entry = (void *)(RADIX_TREE_EXCEPTIONAL_ENTRY |
> RADIX_DAX_ENTRY_LOCK);
> spin_lock_irq(&mapping->tree_lock);
> - err = radix_tree_insert(&mapping->page_tree, index, ret);
> + err = radix_tree_insert(&mapping->page_tree, index, entry);
> radix_tree_preload_end();
> if (err) {
> spin_unlock_irq(&mapping->tree_lock);
> @@ -423,11 +423,11 @@ restart:
> /* Good, we have inserted empty locked entry into the tree. */
> mapping->nrexceptional++;
> spin_unlock_irq(&mapping->tree_lock);
> - return ret;
> + return entry;
> }
> /* Normal page in radix tree? */
> - if (!radix_tree_exceptional_entry(ret)) {
> - struct page *page = ret;
> + if (!radix_tree_exceptional_entry(entry)) {
> + struct page *page = entry;
>
> get_page(page);
> spin_unlock_irq(&mapping->tree_lock);
> @@ -440,9 +440,9 @@ restart:
> }
> return page;
> }
> - ret = lock_slot(mapping, slot);
> + entry = lock_slot(mapping, slot);
> spin_unlock_irq(&mapping->tree_lock);
> - return ret;
> + return entry;
> }
>
> void dax_wake_mapping_entry_waiter(struct address_space *mapping,
> --
> 2.9.0
>
>
--
Jan Kara <[email protected]>
SUSE Labs, CR

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>