[PATCH 1/3] writeback: change nr_pages_dirtied argument into local variable

2012-08-18 Thread Namjae Jeon 
There is no reason nr_pages_dirtied is argument anymore.
because nr_pages_dirtied value from caller is not used in
balance_dirty_pages_ratelimited_nr function.

Signed-off-by: Namjae Jeon 
Signed-off-by: Vivek Trivedi 
---
 fs/btrfs/disk-io.c|8 
 fs/btrfs/file.c   |3 +--
 fs/btrfs/ioctl.c  |2 +-
 fs/ocfs2/file.c   |5 +
 fs/splice.c   |5 +
 include/linux/writeback.h |9 +
 mm/page-writeback.c   |   11 +--
 7 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 62e0caf..10b6128 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3344,8 +3344,8 @@ void btrfs_btree_balance_dirty(struct btrfs_root *root, 
unsigned long nr)
num_dirty = root->fs_info->dirty_metadata_bytes;
 
if (num_dirty > thresh) {
-   balance_dirty_pages_ratelimited_nr(
-  root->fs_info->btree_inode->i_mapping, 1);
+   balance_dirty_pages_ratelimited(
+  root->fs_info->btree_inode->i_mapping);
}
return;
 }
@@ -3365,8 +3365,8 @@ void __btrfs_btree_balance_dirty(struct btrfs_root *root, 
unsigned long nr)
num_dirty = root->fs_info->dirty_metadata_bytes;
 
if (num_dirty > thresh) {
-   balance_dirty_pages_ratelimited_nr(
-  root->fs_info->btree_inode->i_mapping, 1);
+   balance_dirty_pages_ratelimited(
+  root->fs_info->btree_inode->i_mapping);
}
return;
 }
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index f6b40e8..0dae684 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1314,8 +1314,7 @@ static noinline ssize_t __btrfs_buffered_write(struct 
file *file,
 
cond_resched();
 
-   balance_dirty_pages_ratelimited_nr(inode->i_mapping,
-  dirty_pages);
+   balance_dirty_pages_ratelimited(inode->i_mapping);
if (dirty_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1)
btrfs_btree_balance_dirty(root, 1);
 
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 7bb7556..df2e9fb 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1199,7 +1199,7 @@ int btrfs_defrag_file(struct inode *inode, struct file 
*file,
}
 
defrag_count += ret;
-   balance_dirty_pages_ratelimited_nr(inode->i_mapping, ret);
+   balance_dirty_pages_ratelimited(inode->i_mapping);
mutex_unlock(&inode->i_mutex);
 
if (newer_than) {
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 46a1f6d..a83c964 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2515,18 +2515,15 @@ static ssize_t ocfs2_file_splice_write(struct 
pipe_inode_info *pipe,
ret = sd.num_spliced;
 
if (ret > 0) {
-   unsigned long nr_pages;
int err;
 
-   nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
-
err = generic_write_sync(out, *ppos, ret);
if (err)
ret = err;
else
*ppos += ret;
 
-   balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
+   balance_dirty_pages_ratelimited(mapping);
}
 
return ret;
diff --git a/fs/splice.c b/fs/splice.c
index 41514dd..36b6c17 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1024,17 +1024,14 @@ generic_file_splice_write(struct pipe_inode_info *pipe, 
struct file *out,
ret = sd.num_spliced;
 
if (ret > 0) {
-   unsigned long nr_pages;
int err;
 
-   nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
-
err = generic_write_sync(out, *ppos, ret);
if (err)
ret = err;
else
*ppos += ret;
-   balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
+   balance_dirty_pages_ratelimited(mapping);
}
sb_end_write(inode->i_sb);
 
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 50c3e8f..b82a83a 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -161,14 +161,7 @@ void __bdi_update_bandwidth(struct backing_dev_info *bdi,
unsigned long start_time);
 
 void page_writeback_init(void);
-void balance_dirty_pages_ratelimited_nr(struct address_space *mapping,
-   unsigned long nr_pages_dirtied);
-
-static inline void
-balance_dirty_pages_ratelimited(struct address_space *mapping)
-{
-   balance_dirty_pages_ratelimited_nr(mapping, 1);
-}
+void balance_dirty_pages_ratelimited(struct address_space *mapping);
 
 typedef int (*writepage_t)(struct page *page, struc

Re: [PATCH 1/3] writeback: change nr_pages_dirtied argument into local variable

2012-08-23 Thread Namjae Jeon 
2012/8/19, Fengguang Wu :
> On Sat, Aug 18, 2012 at 05:48:29AM -0400, Namjae Jeon wrote:
>> There is no reason nr_pages_dirtied is argument anymore.
>> because nr_pages_dirtied value from caller is not used in
>> balance_dirty_pages_ratelimited_nr function.
>
> Looks good to me. If the fs developers don't have problems with this,
> I'll apply it to the writeback tree.
Thanks Wu!

Hi Chris, Mark, Joel.

Would you check this patch ?
Thanks.

>
> Thanks,
> Fengguang
>
>> Signed-off-by: Namjae Jeon 
>> Signed-off-by: Vivek Trivedi 
>> ---
>>  fs/btrfs/disk-io.c|8 
>>  fs/btrfs/file.c   |3 +--
>>  fs/btrfs/ioctl.c  |2 +-
>>  fs/ocfs2/file.c   |5 +
>>  fs/splice.c   |5 +
>>  include/linux/writeback.h |9 +
>>  mm/page-writeback.c   |   11 +--
>>  7 files changed, 14 insertions(+), 29 deletions(-)
>>
>> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
>> index 62e0caf..10b6128 100644
>> --- a/fs/btrfs/disk-io.c
>> +++ b/fs/btrfs/disk-io.c
>> @@ -3344,8 +3344,8 @@ void btrfs_btree_balance_dirty(struct btrfs_root
>> *root, unsigned long nr)
>>  num_dirty = root->fs_info->dirty_metadata_bytes;
>>
>>  if (num_dirty > thresh) {
>> -balance_dirty_pages_ratelimited_nr(
>> -   root->fs_info->btree_inode->i_mapping, 1);
>> +balance_dirty_pages_ratelimited(
>> +   root->fs_info->btree_inode->i_mapping);
>>  }
>>  return;
>>  }
>> @@ -3365,8 +3365,8 @@ void __btrfs_btree_balance_dirty(struct btrfs_root
>> *root, unsigned long nr)
>>  num_dirty = root->fs_info->dirty_metadata_bytes;
>>
>>  if (num_dirty > thresh) {
>> -balance_dirty_pages_ratelimited_nr(
>> -   root->fs_info->btree_inode->i_mapping, 1);
>> +balance_dirty_pages_ratelimited(
>> +   root->fs_info->btree_inode->i_mapping);
>>  }
>>  return;
>>  }
>> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
>> index f6b40e8..0dae684 100644
>> --- a/fs/btrfs/file.c
>> +++ b/fs/btrfs/file.c
>> @@ -1314,8 +1314,7 @@ static noinline ssize_t
>> __btrfs_buffered_write(struct file *file,
>>
>>  cond_resched();
>>
>> -balance_dirty_pages_ratelimited_nr(inode->i_mapping,
>> -   dirty_pages);
>> +balance_dirty_pages_ratelimited(inode->i_mapping);
>>  if (dirty_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1)
>>  btrfs_btree_balance_dirty(root, 1);
>>
>> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
>> index 7bb7556..df2e9fb 100644
>> --- a/fs/btrfs/ioctl.c
>> +++ b/fs/btrfs/ioctl.c
>> @@ -1199,7 +1199,7 @@ int btrfs_defrag_file(struct inode *inode, struct
>> file *file,
>>  }
>>
>>  defrag_count += ret;
>> -balance_dirty_pages_ratelimited_nr(inode->i_mapping, ret);
>> +balance_dirty_pages_ratelimited(inode->i_mapping);
>>  mutex_unlock(&inode->i_mutex);
>>
>>  if (newer_than) {
>> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
>> index 46a1f6d..a83c964 100644
>> --- a/fs/ocfs2/file.c
>> +++ b/fs/ocfs2/file.c
>> @@ -2515,18 +2515,15 @@ static ssize_t ocfs2_file_splice_write(struct
>> pipe_inode_info *pipe,
>>  ret = sd.num_spliced;
>>
>>  if (ret > 0) {
>> -unsigned long nr_pages;
>>  int err;
>>
>> -nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
>> -
>>  err = generic_write_sync(out, *ppos, ret);
>>  if (err)
>>  ret = err;
>>  else
>>  *ppos += ret;
>>
>> -balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
>> +balance_dirty_pages_ratelimited(mapping);
>>  }
>>
>>  return ret;
>> diff --git a/fs/splice.c b/fs/splice.c
>> index 41514dd..36b6c17 100644
>> --- a/fs/splice.c
>> +++ b/fs/splice.c
>> @@ -1024,17 +1024,14 @@ generic_file_splice_write(struct pipe_inode_info
>> *pipe, struct file *out,
>>  ret = sd.num_spliced;
>>
>>  if (ret > 0) {
>> -unsigned long nr_pages;
>>  int err;
>>
>> -nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
>> -
>>  err = generic_write_sync(out, *ppos, ret);
>>  if (err)
>>  ret = err;
>>  else
>>  *ppos += ret;
>> -balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
>> +balance_dirty_pages_ratelimited(mapping);
>>  }
>>  sb_end_write(inode->i_sb);
>>
>> diff --git a/include/linux/writeback.h b/include/linux/writeback.h
>> index 50c3e8f..b82a83a 100644
>> --- a/include/linux/writeback.h
>> +++ b/include/linux/writeback.h
>> @@ -161,14 +161,7 @@ void __bdi_update_bandwidth(struct backing_dev_info
>> *bdi,
>>  u

Re: [PATCH 1/3] writeback: change nr_pages_dirtied argument into local variable

2012-08-24 Thread David Sterba 
On Thu, Aug 23, 2012 at 05:06:19PM +0900, Namjae Jeon wrote:
> 2012/8/19, Fengguang Wu :
> > On Sat, Aug 18, 2012 at 05:48:29AM -0400, Namjae Jeon wrote:
> >> There is no reason nr_pages_dirtied is argument anymore.
> >> because nr_pages_dirtied value from caller is not used in
> >> balance_dirty_pages_ratelimited_nr function.
> >
> > Looks good to me. If the fs developers don't have problems with this,
> > I'll apply it to the writeback tree.
> Thanks Wu!
> 
> Hi Chris, Mark, Joel.
> 
> Would you check this patch ?

Patch is ok from the btrfs side.

david
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/3] writeback: change nr_pages_dirtied argument into local variable

2012-08-18 Thread Fengguang Wu 
On Sat, Aug 18, 2012 at 05:48:29AM -0400, Namjae Jeon wrote:
> There is no reason nr_pages_dirtied is argument anymore.
> because nr_pages_dirtied value from caller is not used in
> balance_dirty_pages_ratelimited_nr function.

Looks good to me. If the fs developers don't have problems with this,
I'll apply it to the writeback tree.

Thanks,
Fengguang

> Signed-off-by: Namjae Jeon 
> Signed-off-by: Vivek Trivedi 
> ---
>  fs/btrfs/disk-io.c|8 
>  fs/btrfs/file.c   |3 +--
>  fs/btrfs/ioctl.c  |2 +-
>  fs/ocfs2/file.c   |5 +
>  fs/splice.c   |5 +
>  include/linux/writeback.h |9 +
>  mm/page-writeback.c   |   11 +--
>  7 files changed, 14 insertions(+), 29 deletions(-)
> 
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index 62e0caf..10b6128 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -3344,8 +3344,8 @@ void btrfs_btree_balance_dirty(struct btrfs_root *root, 
> unsigned long nr)
>   num_dirty = root->fs_info->dirty_metadata_bytes;
>  
>   if (num_dirty > thresh) {
> - balance_dirty_pages_ratelimited_nr(
> -root->fs_info->btree_inode->i_mapping, 1);
> + balance_dirty_pages_ratelimited(
> +root->fs_info->btree_inode->i_mapping);
>   }
>   return;
>  }
> @@ -3365,8 +3365,8 @@ void __btrfs_btree_balance_dirty(struct btrfs_root 
> *root, unsigned long nr)
>   num_dirty = root->fs_info->dirty_metadata_bytes;
>  
>   if (num_dirty > thresh) {
> - balance_dirty_pages_ratelimited_nr(
> -root->fs_info->btree_inode->i_mapping, 1);
> + balance_dirty_pages_ratelimited(
> +root->fs_info->btree_inode->i_mapping);
>   }
>   return;
>  }
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index f6b40e8..0dae684 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -1314,8 +1314,7 @@ static noinline ssize_t __btrfs_buffered_write(struct 
> file *file,
>  
>   cond_resched();
>  
> - balance_dirty_pages_ratelimited_nr(inode->i_mapping,
> -dirty_pages);
> + balance_dirty_pages_ratelimited(inode->i_mapping);
>   if (dirty_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1)
>   btrfs_btree_balance_dirty(root, 1);
>  
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 7bb7556..df2e9fb 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -1199,7 +1199,7 @@ int btrfs_defrag_file(struct inode *inode, struct file 
> *file,
>   }
>  
>   defrag_count += ret;
> - balance_dirty_pages_ratelimited_nr(inode->i_mapping, ret);
> + balance_dirty_pages_ratelimited(inode->i_mapping);
>   mutex_unlock(&inode->i_mutex);
>  
>   if (newer_than) {
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index 46a1f6d..a83c964 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -2515,18 +2515,15 @@ static ssize_t ocfs2_file_splice_write(struct 
> pipe_inode_info *pipe,
>   ret = sd.num_spliced;
>  
>   if (ret > 0) {
> - unsigned long nr_pages;
>   int err;
>  
> - nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
> -
>   err = generic_write_sync(out, *ppos, ret);
>   if (err)
>   ret = err;
>   else
>   *ppos += ret;
>  
> - balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
> + balance_dirty_pages_ratelimited(mapping);
>   }
>  
>   return ret;
> diff --git a/fs/splice.c b/fs/splice.c
> index 41514dd..36b6c17 100644
> --- a/fs/splice.c
> +++ b/fs/splice.c
> @@ -1024,17 +1024,14 @@ generic_file_splice_write(struct pipe_inode_info 
> *pipe, struct file *out,
>   ret = sd.num_spliced;
>  
>   if (ret > 0) {
> - unsigned long nr_pages;
>   int err;
>  
> - nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
> -
>   err = generic_write_sync(out, *ppos, ret);
>   if (err)
>   ret = err;
>   else
>   *ppos += ret;
> - balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
> + balance_dirty_pages_ratelimited(mapping);
>   }
>   sb_end_write(inode->i_sb);
>  
> diff --git a/include/linux/writeback.h b/include/linux/writeback.h
> index 50c3e8f..b82a83a 100644
> --- a/include/linux/writeback.h
> +++ b/include/linux/writeback.h
> @@ -161,14 +161,7 @@ void __bdi_update_bandwidth(struct backing_dev_info *bdi,
>   unsigned long start_time);
>  
>  void page_writeback_init(void);
> -void balance_dirty_pages_ratelimited_nr(struct address_space *mapping,
> -