Re: [lustre-devel] [PATCH v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Greg Kroah-Hartman]

On Wed, Nov 04, 2015 at 03:07:13PM +, Simmons, James A. wrote:
> >On Tue, Nov 03, 2015 at 07:46:07PM -0800, Greg Kroah-Hartman wrote:
> >> On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
> >> > Cleanup all the unneeded white space in libcfs_hash.h.
> >> > 
> >> > Signed-off-by: James Simmons 
> >> > ---
> >> >  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
> >> > ++--
> >> >  1 files changed, 70 insertions(+), 65 deletions(-)
> >> 
> >> Doesn't apply, did I already queue up this series?
> >
> >No. This did not apply because of:
> >c7fdf4a3959f ("staging: lustre: fix remaining checkpatch issues for 
> >libcfs_hash.h")
> 
> Surprise this was merged which is why I did a second series for this.

Oops, my mistake, I've now dropped this patch from my tree.  Please
resend this series so I can try to sync up properly.

thanks,

greg k-h
--
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: [lustre-devel] [PATCH v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Simmons, James A.]

>On Tue, Nov 03, 2015 at 07:46:07PM -0800, Greg Kroah-Hartman wrote:
>> On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
>> > Cleanup all the unneeded white space in libcfs_hash.h.
>> > 
>> > Signed-off-by: James Simmons 
>> > ---
>> >  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
>> > ++--
>> >  1 files changed, 70 insertions(+), 65 deletions(-)
>> 
>> Doesn't apply, did I already queue up this series?
>
>No. This did not apply because of:
>c7fdf4a3959f ("staging: lustre: fix remaining checkpatch issues for 
>libcfs_hash.h")

Surprise this was merged which is why I did a second series for this.
--
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 v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Simmons, James A.]

>On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
>> Cleanup all the unneeded white space in libcfs_hash.h.
>> 
>> Signed-off-by: James Simmons 
>> ---
>>  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
>> ++--
>>  1 files changed, 70 insertions(+), 65 deletions(-)
>
>Doesn't apply, did I already queue up this series?

I did a second version of those patches. In one batch you will notice [PATCH 
v2].
The reason I did a second batch was to break up the "fix checkpatch issues" 
patch
in the first series. I was trying to behave :-)
--
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 v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Sudip Mukherjee]

On Tue, Nov 03, 2015 at 07:46:07PM -0800, Greg Kroah-Hartman wrote:
> On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
> > Cleanup all the unneeded white space in libcfs_hash.h.
> > 
> > Signed-off-by: James Simmons 
> > ---
> >  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
> > ++--
> >  1 files changed, 70 insertions(+), 65 deletions(-)
> 
> Doesn't apply, did I already queue up this series?

No. This did not apply because of:
c7fdf4a3959f ("staging: lustre: fix remaining checkpatch issues for 
libcfs_hash.h")

regards
sudip
--
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: [lustre-devel] [PATCH v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Simmons, James A.]

>On Tue, Nov 03, 2015 at 07:46:07PM -0800, Greg Kroah-Hartman wrote:
>> On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
>> > Cleanup all the unneeded white space in libcfs_hash.h.
>> > 
>> > Signed-off-by: James Simmons 
>> > ---
>> >  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
>> > ++--
>> >  1 files changed, 70 insertions(+), 65 deletions(-)
>> 
>> Doesn't apply, did I already queue up this series?
>
>No. This did not apply because of:
>c7fdf4a3959f ("staging: lustre: fix remaining checkpatch issues for 
>libcfs_hash.h")

Surprise this was merged which is why I did a second series for this.
--
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 v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Simmons, James A.]

>On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
>> Cleanup all the unneeded white space in libcfs_hash.h.
>> 
>> Signed-off-by: James Simmons 
>> ---
>>  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
>> ++--
>>  1 files changed, 70 insertions(+), 65 deletions(-)
>
>Doesn't apply, did I already queue up this series?

I did a second version of those patches. In one batch you will notice [PATCH 
v2].
The reason I did a second batch was to break up the "fix checkpatch issues" 
patch
in the first series. I was trying to behave :-)
--
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 v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Sudip Mukherjee]

On Tue, Nov 03, 2015 at 07:46:07PM -0800, Greg Kroah-Hartman wrote:
> On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
> > Cleanup all the unneeded white space in libcfs_hash.h.
> > 
> > Signed-off-by: James Simmons 
> > ---
> >  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
> > ++--
> >  1 files changed, 70 insertions(+), 65 deletions(-)
> 
> Doesn't apply, did I already queue up this series?

No. This did not apply because of:
c7fdf4a3959f ("staging: lustre: fix remaining checkpatch issues for 
libcfs_hash.h")

regards
sudip
--
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: [lustre-devel] [PATCH v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Greg Kroah-Hartman]

On Wed, Nov 04, 2015 at 03:07:13PM +, Simmons, James A. wrote:
> >On Tue, Nov 03, 2015 at 07:46:07PM -0800, Greg Kroah-Hartman wrote:
> >> On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
> >> > Cleanup all the unneeded white space in libcfs_hash.h.
> >> > 
> >> > Signed-off-by: James Simmons 
> >> > ---
> >> >  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
> >> > ++--
> >> >  1 files changed, 70 insertions(+), 65 deletions(-)
> >> 
> >> Doesn't apply, did I already queue up this series?
> >
> >No. This did not apply because of:
> >c7fdf4a3959f ("staging: lustre: fix remaining checkpatch issues for 
> >libcfs_hash.h")
> 
> Surprise this was merged which is why I did a second series for this.

Oops, my mistake, I've now dropped this patch from my tree.  Please
resend this series so I can try to sync up properly.

thanks,

greg k-h
--
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 v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Greg Kroah-Hartman]

On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
> Cleanup all the unneeded white space in libcfs_hash.h.
> 
> Signed-off-by: James Simmons 
> ---
>  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
> ++--
>  1 files changed, 70 insertions(+), 65 deletions(-)

Doesn't apply, did I already queue up this series?

confused,

greg k-h
--
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 v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[Greg Kroah-Hartman]

On Mon, Nov 02, 2015 at 12:22:07PM -0500, James Simmons wrote:
> Cleanup all the unneeded white space in libcfs_hash.h.
> 
> Signed-off-by: James Simmons 
> ---
>  .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 
> ++--
>  1 files changed, 70 insertions(+), 65 deletions(-)

Doesn't apply, did I already queue up this series?

confused,

greg k-h
--
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/

[PATCH v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[James Simmons]

Cleanup all the unneeded white space in libcfs_hash.h.

Signed-off-by: James Simmons 
---
 .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 ++--
 1 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h 
b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
index 70b8b29..4d73f8a 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
@@ -66,12 +66,12 @@
 #include 
 
 /** disable debug */
-#define CFS_HASH_DEBUG_NONE 0
+#define CFS_HASH_DEBUG_NONE0
 /** record hash depth and output to console when it's too deep,
  *  computing overhead is low but consume more memory */
-#define CFS_HASH_DEBUG_1   1
+#define CFS_HASH_DEBUG_1   1
 /** expensive, check key validation */
-#define CFS_HASH_DEBUG_2   2
+#define CFS_HASH_DEBUG_2   2
 
 #define CFS_HASH_DEBUG_LEVEL   CFS_HASH_DEBUG_NONE
 
@@ -108,16 +108,18 @@ struct cfs_hash_bucket {
  * cfs_hash bucket descriptor, it's normally in stack of caller
  */
 struct cfs_hash_bd {
-   struct cfs_hash_bucket  *bd_bucket;  /**< address of bucket */
-   unsigned intbd_offset;  /**< offset in bucket */
+   /* address of bucket */
+   struct cfs_hash_bucket  *bd_bucket;
+   /* offset in bucket */
+   unsigned int bd_offset;
 };
 
-#define CFS_HASH_NAME_LEN 16  /**< default name length */
-#define CFS_HASH_BIGNAME_LEN   64  /**< bigname for param tree */
+#define CFS_HASH_NAME_LEN  16  /**< default name length */
+#define CFS_HASH_BIGNAME_LEN   64  /**< bigname for param tree */
 
-#define CFS_HASH_BKT_BITS 3   /**< default bits of bucket */
-#define CFS_HASH_BITS_MAX 30  /**< max bits of bucket */
-#define CFS_HASH_BITS_MIN CFS_HASH_BKT_BITS
+#define CFS_HASH_BKT_BITS  3   /**< default bits of bucket */
+#define CFS_HASH_BITS_MAX  30  /**< max bits of bucket */
+#define CFS_HASH_BITS_MIN  CFS_HASH_BKT_BITS
 
 /**
  * common hash attributes.
@@ -133,41 +135,41 @@ enum cfs_hash_tag {
 */
CFS_HASH_NO_LOCK= 1 << 0,
/** no bucket lock, use one spinlock to protect the whole hash */
-   CFS_HASH_NO_BKTLOCK = 1 << 1,
+   CFS_HASH_NO_BKTLOCK = 1 << 1,
/** rwlock to protect bucket */
-   CFS_HASH_RW_BKTLOCK = 1 << 2,
+   CFS_HASH_RW_BKTLOCK = 1 << 2,
/** spinlock to protect bucket */
-   CFS_HASH_SPIN_BKTLOCK   = 1 << 3,
+   CFS_HASH_SPIN_BKTLOCK   = 1 << 3,
/** always add new item to tail */
-   CFS_HASH_ADD_TAIL   = 1 << 4,
+   CFS_HASH_ADD_TAIL   = 1 << 4,
/** hash-table doesn't have refcount on item */
-   CFS_HASH_NO_ITEMREF = 1 << 5,
+   CFS_HASH_NO_ITEMREF = 1 << 5,
/** big name for param-tree */
CFS_HASH_BIGNAME= 1 << 6,
/** track global count */
CFS_HASH_COUNTER= 1 << 7,
/** rehash item by new key */
-   CFS_HASH_REHASH_KEY = 1 << 8,
+   CFS_HASH_REHASH_KEY = 1 << 8,
/** Enable dynamic hash resizing */
-   CFS_HASH_REHASH  = 1 << 9,
+   CFS_HASH_REHASH = 1 << 9,
/** can shrink hash-size */
-   CFS_HASH_SHRINK  = 1 << 10,
+   CFS_HASH_SHRINK = 1 << 10,
/** assert hash is empty on exit */
-   CFS_HASH_ASSERT_EMPTY   = 1 << 11,
+   CFS_HASH_ASSERT_EMPTY   = 1 << 11,
/** record hlist depth */
-   CFS_HASH_DEPTH= 1 << 12,
+   CFS_HASH_DEPTH  = 1 << 12,
/**
 * rehash is always scheduled in a different thread, so current
 * change on hash table is non-blocking
 */
-   CFS_HASH_NBLK_CHANGE= 1 << 13,
+   CFS_HASH_NBLK_CHANGE= 1 << 13,
/** NB, we typed hs_flags as  __u16, please change it
 * if you need to extend >=16 flags */
 };
 
 /** most used attributes */
-#define CFS_HASH_DEFAULT   (CFS_HASH_RW_BKTLOCK | \
-   CFS_HASH_COUNTER | CFS_HASH_REHASH)
+#define CFS_HASH_DEFAULT   (CFS_HASH_RW_BKTLOCK | \
+CFS_HASH_COUNTER | CFS_HASH_REHASH)
 
 /**
  * cfs_hash is a hash-table implementation for general purpose, it can support:
@@ -211,7 +213,7 @@ enum cfs_hash_tag {
 struct cfs_hash {
/** serialize with rehash, or serialize all operations if
 * the hash-table has CFS_HASH_NO_BKTLOCK */
-   union cfs_hash_lock  hs_lock;
+   union cfs_hash_lock hs_lock;
/** hash operations */
struct cfs_hash_ops *hs_ops;
/** hash lock operations */
@@ -219,57 +221,57 @@ struct cfs_hash {
/** hash list operations */
struct cfs_hash_hlist_ops   *hs_hops;
/** hash buckets-table */
-   struct cfs_hash_bucket   **hs_buckets;
+   

[PATCH v2 1/7] staging: lustre: remove white space in libcfs_hash.h

[James Simmons]

Cleanup all the unneeded white space in libcfs_hash.h.

Signed-off-by: James Simmons 
---
 .../lustre/include/linux/libcfs/libcfs_hash.h  |  135 ++--
 1 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h 
b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
index 70b8b29..4d73f8a 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
@@ -66,12 +66,12 @@
 #include 
 
 /** disable debug */
-#define CFS_HASH_DEBUG_NONE 0
+#define CFS_HASH_DEBUG_NONE0
 /** record hash depth and output to console when it's too deep,
  *  computing overhead is low but consume more memory */
-#define CFS_HASH_DEBUG_1   1
+#define CFS_HASH_DEBUG_1   1
 /** expensive, check key validation */
-#define CFS_HASH_DEBUG_2   2
+#define CFS_HASH_DEBUG_2   2
 
 #define CFS_HASH_DEBUG_LEVEL   CFS_HASH_DEBUG_NONE
 
@@ -108,16 +108,18 @@ struct cfs_hash_bucket {
  * cfs_hash bucket descriptor, it's normally in stack of caller
  */
 struct cfs_hash_bd {
-   struct cfs_hash_bucket  *bd_bucket;  /**< address of bucket */
-   unsigned intbd_offset;  /**< offset in bucket */
+   /* address of bucket */
+   struct cfs_hash_bucket  *bd_bucket;
+   /* offset in bucket */
+   unsigned int bd_offset;
 };
 
-#define CFS_HASH_NAME_LEN 16  /**< default name length */
-#define CFS_HASH_BIGNAME_LEN   64  /**< bigname for param tree */
+#define CFS_HASH_NAME_LEN  16  /**< default name length */
+#define CFS_HASH_BIGNAME_LEN   64  /**< bigname for param tree */
 
-#define CFS_HASH_BKT_BITS 3   /**< default bits of bucket */
-#define CFS_HASH_BITS_MAX 30  /**< max bits of bucket */
-#define CFS_HASH_BITS_MIN CFS_HASH_BKT_BITS
+#define CFS_HASH_BKT_BITS  3   /**< default bits of bucket */
+#define CFS_HASH_BITS_MAX  30  /**< max bits of bucket */
+#define CFS_HASH_BITS_MIN  CFS_HASH_BKT_BITS
 
 /**
  * common hash attributes.
@@ -133,41 +135,41 @@ enum cfs_hash_tag {
 */
CFS_HASH_NO_LOCK= 1 << 0,
/** no bucket lock, use one spinlock to protect the whole hash */
-   CFS_HASH_NO_BKTLOCK = 1 << 1,
+   CFS_HASH_NO_BKTLOCK = 1 << 1,
/** rwlock to protect bucket */
-   CFS_HASH_RW_BKTLOCK = 1 << 2,
+   CFS_HASH_RW_BKTLOCK = 1 << 2,
/** spinlock to protect bucket */
-   CFS_HASH_SPIN_BKTLOCK   = 1 << 3,
+   CFS_HASH_SPIN_BKTLOCK   = 1 << 3,
/** always add new item to tail */
-   CFS_HASH_ADD_TAIL   = 1 << 4,
+   CFS_HASH_ADD_TAIL   = 1 << 4,
/** hash-table doesn't have refcount on item */
-   CFS_HASH_NO_ITEMREF = 1 << 5,
+   CFS_HASH_NO_ITEMREF = 1 << 5,
/** big name for param-tree */
CFS_HASH_BIGNAME= 1 << 6,
/** track global count */
CFS_HASH_COUNTER= 1 << 7,
/** rehash item by new key */
-   CFS_HASH_REHASH_KEY = 1 << 8,
+   CFS_HASH_REHASH_KEY = 1 << 8,
/** Enable dynamic hash resizing */
-   CFS_HASH_REHASH  = 1 << 9,
+   CFS_HASH_REHASH = 1 << 9,
/** can shrink hash-size */
-   CFS_HASH_SHRINK  = 1 << 10,
+   CFS_HASH_SHRINK = 1 << 10,
/** assert hash is empty on exit */
-   CFS_HASH_ASSERT_EMPTY   = 1 << 11,
+   CFS_HASH_ASSERT_EMPTY   = 1 << 11,
/** record hlist depth */
-   CFS_HASH_DEPTH= 1 << 12,
+   CFS_HASH_DEPTH  = 1 << 12,
/**
 * rehash is always scheduled in a different thread, so current
 * change on hash table is non-blocking
 */
-   CFS_HASH_NBLK_CHANGE= 1 << 13,
+   CFS_HASH_NBLK_CHANGE= 1 << 13,
/** NB, we typed hs_flags as  __u16, please change it
 * if you need to extend >=16 flags */
 };
 
 /** most used attributes */
-#define CFS_HASH_DEFAULT   (CFS_HASH_RW_BKTLOCK | \
-   CFS_HASH_COUNTER | CFS_HASH_REHASH)
+#define CFS_HASH_DEFAULT   (CFS_HASH_RW_BKTLOCK | \
+CFS_HASH_COUNTER | CFS_HASH_REHASH)
 
 /**
  * cfs_hash is a hash-table implementation for general purpose, it can support:
@@ -211,7 +213,7 @@ enum cfs_hash_tag {
 struct cfs_hash {
/** serialize with rehash, or serialize all operations if
 * the hash-table has CFS_HASH_NO_BKTLOCK */
-   union cfs_hash_lock  hs_lock;
+   union cfs_hash_lock hs_lock;
/** hash operations */
struct cfs_hash_ops *hs_ops;
/** hash lock operations */
@@ -219,57 +221,57 @@ struct cfs_hash {
/** hash list operations */
struct cfs_hash_hlist_ops   *hs_hops;
/** hash buckets-table */
-   struct cfs_hash_bucket