[PATCH 00/12] xfs: a chunk of comment fixes

[PATCH 00/12] xfs: a chunk of comment fixes

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

  Submit a chunk of xfs commnt fixes.

Zhi Yong Wu (12):
  xfs: fix the comment of xfs_check_sizes()
  xfs: fix the comment of xfs_buf_free()
  xfs: fix the comment of xfs_btree_lookup()
  xfs: fix the comment of xfs_mod_incore_sb_unlocked()
  xfs: fix the comment of xlog_write_setup_copy()
  xfs: remove one blank line in xfs_btree_make_block_unfull()
  xfs: fix the comment of xfs_iroot_realloc()
  xfs: fix the comment of xfs_btree_get_iroot()
  xfs: remove two unused macro definitions in xfs_linux.h
  xfs: fix the comment of xlog_recover_buffer_pass2()
  xfs: fix the comment of xlog_find_head()
  xfs: rename bio_add_buffer() to xfs_bio_add_buffer()

 fs/xfs/xfs_aops.c        | 4 ++--
 fs/xfs/xfs_btree.c       | 5 ++---
 fs/xfs/xfs_buf.c         | 2 +-
 fs/xfs/xfs_inode.c       | 2 +-
 fs/xfs/xfs_linux.h       | 2 --
 fs/xfs/xfs_log.c         | 2 +-
 fs/xfs/xfs_log_recover.c | 4 ++--
 fs/xfs/xfs_mount.c       | 4 ++--
 8 files changed, 11 insertions(+), 14 deletions(-)

-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 01/12] xfs: fix the comment of xfs_check_sizes()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 2b0ba35..bbabc6d 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1194,7 +1194,7 @@ xfs_set_inoalignment(xfs_mount_t *mp)
 }
 
 /*
- * Check that the data (and log if separate) are an ok size.
+ * Check that the data (and log if separate) is an ok size.
  */
 STATIC int
 xfs_check_sizes(xfs_mount_t *mp)
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 02/12] xfs: fix the comment of xfs_buf_free()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_buf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 1b2472a..3997571 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -303,7 +303,7 @@ _xfs_buf_free_pages(
  *	Releases the specified buffer.
  *
  * 	The modification state of any associated pages is left unchanged.
- * 	The buffer most not be on any hash - use xfs_buf_rele instead for
+ * 	The buffer must not be on any hash - use xfs_buf_rele instead for
  * 	hashed and refcounted buffers
  */
 void
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 03/12] xfs: fix the comment of xfs_btree_lookup()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_btree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 0903960..1ecc041 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -1684,7 +1684,7 @@ xfs_lookup_get_search_key(
 
 /*
  * Lookup the record.  The cursor is made to point to it, based on dir.
- * Return 0 if can't find any such record, 1 for success.
+ * stat is set to 0 if can't find any such record, 1 for success.
  */
 int					/* error */
 xfs_btree_lookup(
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 04/12] xfs: fix the comment of xfs_mod_incore_sb_unlocked()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index bbabc6d..5642be3 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1794,7 +1794,7 @@ xfs_mod_sb(xfs_trans_t *tp, __int64_t fields)
 
 
 /*
- * xfs_mod_incore_sb_unlocked() is a utility routine common used to apply
+ * xfs_mod_incore_sb_unlocked() is a utility routine commonly used to apply
  * a delta to a specified field in the in-core superblock.  Simply
  * switch on the field indicated and apply the delta to that field.
  * Fields are not allowed to dip below zero, so if the delta would
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 05/12] xfs: fix the comment of xlog_write_setup_copy()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_log.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index d852a2b..0fd27dc 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -2044,7 +2044,7 @@ xlog_write_setup_ophdr(
  * Set up the parameters of the region copy into the log. This has
  * to handle region write split across multiple log buffers - this
  * state is kept external to this function so that this code can
- * can be written in an obvious, self documenting manner.
+ * be written in an obvious, self documenting manner.
  */
 static int
 xlog_write_setup_copy(
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 06/12] xfs: remove one blank line in xfs_btree_make_block_unfull()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_btree.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 1ecc041..eccc788 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -2756,7 +2756,6 @@ xfs_btree_make_block_unfull(
 
 		if (numrecs < cur->bc_ops->get_dmaxrecs(cur, level)) {
 			/* A root block that can be made bigger. */
-
 			xfs_iroot_realloc(ip, 1, cur->bc_private.b.whichfork);
 		} else {
 			/* A root block that needs replacing */
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 07/12] xfs: fix the comment of xfs_iroot_realloc()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index bb262c2..ccca9cd 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2103,7 +2103,7 @@ xfs_ifree(
  *
  * The caller must not request to add more records than would fit in
  * the on-disk inode root.  If the if_broot is currently NULL, then
- * if we adding records one will be allocated.  The caller must also
+ * if we are adding records, one will be allocated.  The caller must also
  * not request that the number of records go below zero, although
  * it can go to zero.
  *
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 08/12] xfs: fix the comment of xfs_btree_get_iroot()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_btree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index eccc788..ae106f6 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -510,7 +510,7 @@ xfs_btree_ptr_addr(
 }
 
 /*
- * Get a the root block which is stored in the inode.
+ * Get the root block which is stored in the inode.
  *
  * For now this btree implementation assumes the btree root is always
  * stored in the if_broot field of an inode fork.
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 09/12] xfs: remove two unused macro definitions in xfs_linux.h

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_linux.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 800f896..84063ad 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -114,8 +114,6 @@
 #define xfs_inherit_sync	xfs_params.inherit_sync.val
 #define xfs_inherit_nodump	xfs_params.inherit_nodump.val
 #define xfs_inherit_noatime	xfs_params.inherit_noatim.val
-#define xfs_buf_timer_centisecs	xfs_params.xfs_buf_timer.val
-#define xfs_buf_age_centisecs	xfs_params.xfs_buf_age.val
 #define xfs_inherit_nosymlinks	xfs_params.inherit_nosym.val
 #define xfs_rotorstep		xfs_params.rotorstep.val
 #define xfs_inherit_nodefrag	xfs_params.inherit_nodfrg.val
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 10/12] xfs: fix the comment of xlog_recover_buffer_pass2()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_log_recover.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 7681b19..5623014 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2425,7 +2425,7 @@ xlog_recover_do_dquot_buffer(
  * over the log during recovery.  During the first we build a table of
  * those buffers which have been cancelled, and during the second we
  * only replay those buffers which do not have corresponding cancel
- * records in the table.  See xlog_recover_do_buffer_pass[1,2] above
+ * records in the table.  See xlog_recover_buffer_pass[1,2] above
  * for more details on the implementation of the table of cancel records.
  */
 STATIC int
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 11/12] xfs: fix the comment of xlog_find_head()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_log_recover.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 5623014..a5e1bf6 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -607,7 +607,7 @@ out:
 
 /*
  * Head is defined to be the point of the log where the next log write
- * write could go.  This means that incomplete LR writes at the end are
+ * could go.  This means that incomplete LR writes at the end are
  * eliminated when calculating the head.  We aren't guaranteed that previous
  * LR have complete transactions.  We only know that a cycle number of
  * current cycle number -1 won't be present in the log if we start writing
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 12/12] xfs: rename bio_add_buffer() to xfs_bio_add_buffer()

[zwu.kernel]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Follow up with xfs naming style.

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 fs/xfs/xfs_aops.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 596ec71..b724002 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -451,7 +451,7 @@ xfs_start_page_writeback(
 		end_page_writeback(page);
 }
 
-static inline int bio_add_buffer(struct bio *bio, struct buffer_head *bh)
+static inline int xfs_bio_add_buffer(struct bio *bio, struct buffer_head *bh)
 {
 	return bio_add_page(bio, bh->b_page, bh->b_size, bh_offset(bh));
 }
@@ -525,7 +525,7 @@ xfs_submit_ioend(
 				goto retry;
 			}
 
-			if (bio_add_buffer(bio, bh) != bh->b_size) {
+			if (xfs_bio_add_buffer(bio, bh) != bh->b_size) {
 				xfs_submit_ioend_bio(wbc, ioend, bio);
 				goto retry;
 			}
-- 
1.7.11.7

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 07/12] xfs: fix the comment of xfs_iroot_realloc()

[Mark Tinguely]

On 08/07/13 05:11, zwu.kernel@gmail.com wrote:
> From: Zhi Yong Wu<wuzhy@linux.vnet.ibm.com>
>
> Signed-off-by: Zhi Yong Wu<wuzhy@linux.vnet.ibm.com>
> ---
>   fs/xfs/xfs_inode.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index bb262c2..ccca9cd 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2103,7 +2103,7 @@ xfs_ifree(
>    *
>    * The caller must not request to add more records than would fit in
>    * the on-disk inode root.  If the if_broot is currently NULL, then
> - * if we adding records one will be allocated.  The caller must also
> + * if we are adding records, one will be allocated.  The caller must also
>    * not request that the number of records go below zero, although
>    * it can go to zero.
>    *


Change this to xfs_inode_fork.c and the series will apply on top of 
Dave's "current patch queue for Linux 3.12":

   http://oss.sgi.com/archives/xfs/2013-07/msg00411.html

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 07/12] xfs: fix the comment of xfs_iroot_realloc()

[Zhi Yong Wu]

On Wed, Aug 7, 2013 at 9:29 PM, Mark Tinguely <tinguely@sgi.com> wrote:
> On 08/07/13 05:11, zwu.kernel@gmail.com wrote:
>>
>> From: Zhi Yong Wu<wuzhy@linux.vnet.ibm.com>
>>
>> Signed-off-by: Zhi Yong Wu<wuzhy@linux.vnet.ibm.com>
>> ---
>>   fs/xfs/xfs_inode.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
>> index bb262c2..ccca9cd 100644
>> --- a/fs/xfs/xfs_inode.c
>> +++ b/fs/xfs/xfs_inode.c
>> @@ -2103,7 +2103,7 @@ xfs_ifree(
>>    *
>>    * The caller must not request to add more records than would fit in
>>    * the on-disk inode root.  If the if_broot is currently NULL, then
>> - * if we adding records one will be allocated.  The caller must also
>> + * if we are adding records, one will be allocated.  The caller must also
>>    * not request that the number of records go below zero, although
>>    * it can go to zero.
>>    *
>
>
>
> Change this to xfs_inode_fork.c and the series will apply on top of Dave's
> "current patch queue for Linux 3.12":
Do you mean that you have done this or i need to do this? If i need to do this,
can you let me know where i can get xfs git repo which has applied
Dave's patchset?

>
>   http://oss.sgi.com/archives/xfs/2013-07/msg00411.html



-- 
Regards,

Zhi Yong Wu

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 07/12] xfs: fix the comment of xfs_iroot_realloc()

[Mark Tinguely]

On 08/07/13 09:01, Zhi Yong Wu wrote:
> On Wed, Aug 7, 2013 at 9:29 PM, Mark Tinguely<tinguely@sgi.com>  wrote:
>> On 08/07/13 05:11, zwu.kernel@gmail.com wrote:
>>>
>>> From: Zhi Yong Wu<wuzhy@linux.vnet.ibm.com>
>>>
>>> Signed-off-by: Zhi Yong Wu<wuzhy@linux.vnet.ibm.com>
>>> ---
>>>    fs/xfs/xfs_inode.c | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
>>> index bb262c2..ccca9cd 100644
>>> --- a/fs/xfs/xfs_inode.c
>>> +++ b/fs/xfs/xfs_inode.c
>>> @@ -2103,7 +2103,7 @@ xfs_ifree(
>>>     *
>>>     * The caller must not request to add more records than would fit in
>>>     * the on-disk inode root.  If the if_broot is currently NULL, then
>>> - * if we adding records one will be allocated.  The caller must also
>>> + * if we are adding records, one will be allocated.  The caller must also
>>>     * not request that the number of records go below zero, although
>>>     * it can go to zero.
>>>     *
>>
>>
>>
>> Change this to xfs_inode_fork.c and the series will apply on top of Dave's
>> "current patch queue for Linux 3.12":
> Do you mean that you have done this or i need to do this? If i need to do this,
> can you let me know where i can get xfs git repo which has applied
> Dave's patchset?
>
>>
>>    http://oss.sgi.com/archives/xfs/2013-07/msg00411.html


If approved, we can make the change on commit.

The patches look okay to me.

--Mark.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 07/12] xfs: fix the comment of xfs_iroot_realloc()

[Zhi Yong Wu]

On Wed, Aug 7, 2013 at 10:30 PM, Mark Tinguely <tinguely@sgi.com> wrote:
> On 08/07/13 09:01, Zhi Yong Wu wrote:
>>
>> On Wed, Aug 7, 2013 at 9:29 PM, Mark Tinguely<tinguely@sgi.com>  wrote:
>>>
>>> On 08/07/13 05:11, zwu.kernel@gmail.com wrote:
>>>>
>>>>
>>>> From: Zhi Yong Wu<wuzhy@linux.vnet.ibm.com>
>>>>
>>>> Signed-off-by: Zhi Yong Wu<wuzhy@linux.vnet.ibm.com>
>>>> ---
>>>>    fs/xfs/xfs_inode.c | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
>>>> index bb262c2..ccca9cd 100644
>>>> --- a/fs/xfs/xfs_inode.c
>>>> +++ b/fs/xfs/xfs_inode.c
>>>> @@ -2103,7 +2103,7 @@ xfs_ifree(
>>>>     *
>>>>     * The caller must not request to add more records than would fit in
>>>>     * the on-disk inode root.  If the if_broot is currently NULL, then
>>>> - * if we adding records one will be allocated.  The caller must also
>>>> + * if we are adding records, one will be allocated.  The caller must
>>>> also
>>>>     * not request that the number of records go below zero, although
>>>>     * it can go to zero.
>>>>     *
>>>
>>>
>>>
>>>
>>> Change this to xfs_inode_fork.c and the series will apply on top of
>>> Dave's
>>> "current patch queue for Linux 3.12":
>>
>> Do you mean that you have done this or i need to do this? If i need to do
>> this,
>> can you let me know where i can get xfs git repo which has applied
>> Dave's patchset?
>>
>>>
>>>    http://oss.sgi.com/archives/xfs/2013-07/msg00411.html
>
>
>
> If approved, we can make the change on commit.
Please feel free to do it, thanks a lot.
>
> The patches look okay to me.
>
> --Mark.
>



-- 
Regards,

Zhi Yong Wu

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 00/12] xfs: a chunk of comment fixes

[Ben Myers]

On Wed, Aug 07, 2013 at 06:10:57PM +0800, zwu.kernel@gmail.com wrote:
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
> 
>   Submit a chunk of xfs commnt fixes.

Applied this series.  Thanks.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs