staging: lustre: fixed comments without */ on a separate line

PATCH Superseded Mario Bambagini 3 participants 6 messages Jul 25, 2015 – Jul 27, 2015

Subsystems (2)

Staging Checkpatch

lore

Share & tools

lore

Mario Bambagini

author

2015-07-25 16:23 UTC #0 lore raw

PATCH 1/2 staging: lustre: fixed comments without */ on a separate line

this set of patches fixes several code style problems:
-patch 1: comments without */ on a separate line -patch 2: lines with more than 80 chars

This patch fixes 4 comments without */ on a new line

Signed-off-by Mario Bambagini <[email protected]>

---
 drivers/staging/lustre/lustre/llite/llite_capa.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/staging/lustre/lustre/llite/llite_capa.c +8 -4

index a626871..119f017 100644
@@ -206,7 +206,8 @@ static int capa_thread_main(void *unused)
 			 * lock.
 			 */
 			/* ibits may be changed by ll_have_md_lock() so we have
-			 * to set it each time */
+			 * to set it each time
+			 */
 			ibits = MDS_INODELOCK_LOOKUP;
 			if (capa_for_mds(&ocapa->c_capa) &&
 			    !S_ISDIR(ocapa->u.cli.inode->i_mode) &&

@@ -225,7 +226,8 @@ static int capa_thread_main(void *unused)
 			if (capa_for_oss(&ocapa->c_capa) &&
 			    obd_capa_open_count(ocapa) == 0) {
 				/* oss capa with open count == 0 won't renew,
-				 * move to idle list */
+				 * move to idle list
+				 */
 				sort_add_capa(ocapa, &ll_idle_capas);
 				continue;
 			}

@@ -447,7 +449,8 @@ static inline void inode_add_oss_capa(struct inode *inode,
 	struct list_head *next = NULL;
 
 	/* capa is sorted in lli_oss_capas so lookup can always find the
-	 * latest one */
+	 * latest one
+	 */
 	list_for_each_entry(tmp, &lli->lli_oss_capas, u.cli.lli_list) {
 		if (cfs_time_after(ocapa->c_expiry, tmp->c_expiry)) {
 			next = &tmp->u.cli.lli_list;

@@ -537,7 +540,8 @@ static int ll_update_capa(struct obd_capa *ocapa, struct lustre_capa *capa)
 			ll_capa_renewal_failed++;
 
 			/* failed capa won't be renewed any longer, but if -EIO,
-			 * client might be doing recovery, retry in 2 min. */
+			 * client might be doing recovery, retry in 2 min.
+			 */
 			if (rc == -EIO && !capa_is_expired(ocapa)) {
 				delay_capa_renew(ocapa, 120);
 				DEBUG_CAPA(D_ERROR, &ocapa->c_capa,

Signature · 1 line

2.1.4

Mario Bambagini

author

2015-07-25 16:23 UTC #1 lore raw

PATCH 2/2 staging: lustre: fixed 80-char rule

This patch fixes 2 lines longer than 80 chars

The first one is a function whose argument has been moved to next line. The second one is a comment split on two lines

The script checkpatch does not complain anymore

Signed-off-by Mario Bambagini <[email protected]>

---
 drivers/staging/lustre/lustre/llite/llite_capa.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/staging/lustre/lustre/llite/llite_capa.c +4 -2

index 119f017..1f72066 100644
@@ -70,7 +70,8 @@ static unsigned long long ll_capa_renewal_retries;
 
 static int ll_update_capa(struct obd_capa *ocapa, struct lustre_capa *capa);
 
-static inline void update_capa_timer(struct obd_capa *ocapa, unsigned long expiry)
+static inline void update_capa_timer(struct obd_capa *ocapa,
+							   unsigned long expiry)
 {
 	if (time_before(expiry, ll_capa_timer.expires) ||
 	    !timer_pending(&ll_capa_timer)) {

@@ -165,7 +166,8 @@ static void ll_delete_capa(struct obd_capa *ocapa)
 /* three places where client capa is deleted:
  * 1. capa_thread_main(), main place to delete expired capa.
  * 2. ll_clear_inode_capas() in ll_clear_inode().
- * 3. ll_truncate_free_capa() delete truncate capa explicitly in ll_setattr_ost().
+ * 3. ll_truncate_free_capa() delete truncate capa explicitly in
+ *    ll_setattr_ost().
  */
 static int capa_thread_main(void *unused)
 {

Signature · 1 line

2.1.4

Dan Carpenter

2015-07-26 19:14 UTC #2 lore raw

Re: [PATCH 2/2] staging: lustre: fixed 80-char rule

Quoted 17 lines · Mario Bambagini

This patch fixes 2 lines longer than 80 chars
The first one is a function whose argument has been moved to next line. The second one is a comment split on two lines
The script checkpatch does not complain anymore
Signed-off-by Mario Bambagini <[email protected]>
---
 drivers/staging/lustre/lustre/llite/llite_capa.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/llite/llite_capa.c +0 -0
index 119f017..1f72066 100644

drivers/staging/lustre/lustre/llite/llite_capa.c static unsigned long long ll_capa_renewal_retries; · line 74

Quoted 6 lines

drivers/staging/lustre/lustre/llite/llite_capa.c +2 -1

@@ -70,7 +70,8 @@ static unsigned long long ll_capa_renewal_retries;
 
 static int ll_update_capa(struct obd_capa *ocapa, struct lustre_capa *capa);
 
-static inline void update_capa_timer(struct obd_capa *ocapa, unsigned long expiry)
+static inline void update_capa_timer(struct obd_capa *ocapa,
+							   unsigned long expiry)

This is wrong. Run your patch through checkpatch.pl --strict and it will help you.

regards,
dan carpenter

Joe Perches

maintainer

2015-07-26 19:49 UTC #3 lore raw

RFC PATCH 1/1 checkpatch: Make --strict the default for drivers/staging files and patches

Making --strict the default for staging may help some people submit patches without obvious defects.

Signed-off-by Joe Perches <[email protected]>

---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

scripts/checkpatch.pl +1 -1

index 34ca400..50693f5 100755
@@ -2174,7 +2174,7 @@ sub process {
 		}
 
 		if ($found_file) {
-			if ($realfile =~ m@^(drivers/net/|net/)@) {
+			if ($realfile =~ m@^(?:drivers/net/|net/|drivers/staging/)@) {
 				$check = 1;
 			} else {
 				$check = $check_orig;

Dan Carpenter

2015-07-27 09:25 UTC #4 lore raw

Re: [RFC PATCH] checkpatch: Make --strict the default for drivers/staging files and patches

I wish there were some way to say that, "this is important enough that we will make you redo your patch but not important enough to redo all the existing code."

Although for staging I guess we welcome the churn so I am ok with this.

regards,
dan carpenter

Mario Bambagini

author

2015-07-27 19:15 UTC #5 lore raw

Re: [PATCH 2/2] staging: lustre: fixed 80-char rule

In reply to Dan Carpenter

Quoted 28 lines · Dan Carpenter

Quoted 17 lines · Mario Bambagini
This patch fixes 2 lines longer than 80 chars
The first one is a function whose argument has been moved to next line. The second one is a comment split on two lines
The script checkpatch does not complain anymore
Signed-off-by Mario Bambagini <[email protected]>
---
 drivers/staging/lustre/lustre/llite/llite_capa.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/llite/llite_capa.c +0 -0
index 119f017..1f72066 100644
drivers/staging/lustre/lustre/llite/llite_capa.c static unsigned long long ll_capa_renewal_retries; · line 74
Quoted 6 lines
drivers/staging/lustre/lustre/llite/llite_capa.c +2 -1
@@ -70,7 +70,8 @@ static unsigned long long ll_capa_renewal_retries;
 
 static int ll_update_capa(struct obd_capa *ocapa, struct lustre_capa *capa);
 
-static inline void update_capa_timer(struct obd_capa *ocapa, unsigned long expiry)
+static inline void update_capa_timer(struct obd_capa *ocapa,
+							   unsigned long expiry)
This is wrong. Run your patch through checkpatch.pl --strict and it will help you.

Quoted 3 lines

regards,
dan carpenter

Thank you for the hint. I'll resend the set of patches.

regards
MB