[PATCH] staging: lustre: namei.c: coding style: fix 80 characters limit

[PATCH] staging: lustre: namei.c: coding style: fix 80 characters limit

[Maxime Lorrillere]

From: Laure Millet <laure.millet@lip6.fr>

This patch fixes lines over 80 characters

Signed-off-by: Laure Millet <laure.millet@lip6.fr>
Signed-off-by: Maxime Lorrillere <maxime.lorrillere@lip6.fr>
---
 drivers/staging/lustre/lustre/llite/namei.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 3fa529d..49f1cb0 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -83,7 +83,8 @@ static int ll_set_inode(struct inode *inode, void *opaque)
 
 	lli->lli_fid = body->fid1;
 	if (unlikely(!(body->valid & OBD_MD_FLTYPE))) {
-		CERROR("Can not initialize inode " DFID " without object type: valid = %#llx\n",
+		CERROR("Can not initialize inode " DFID
+		       " without object type: valid = %#llx\n",
 		       PFID(&lli->lli_fid), body->valid);
 		return -EINVAL;
 	}
@@ -600,7 +601,8 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
 	long long lookup_flags = LOOKUP_OPEN;
 	int rc = 0;
 
-	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),file %p,open_flags %x,mode %x opened %d\n",
+	CDEBUG(D_VFSTRACE,
+	       "VFS Op:name=%pd,dir=%lu/%u(%p),file %p,open_flags %x,mode %x opened %d\n",
 	       dentry, dir->i_ino,
 	       dir->i_generation, dir, file, open_flags, mode, *opened);
 
-- 
1.7.10.4

Re: [PATCH] staging: lustre: namei.c: coding style: fix 80 characters limit

[Dilger, Andreas]

On 2015/03/18, 1:07 PM, "Maxime Lorrillere" <maxime.lorrillere@lip6.fr>
wrote:

>From: Laure Millet <laure.millet@lip6.fr>
>
>This patch fixes lines over 80 characters

I think the newer rule is that strings shouldn't be split across lines.
That makes
the first hunk invalid, though the second one is OK.


Cheers, Andreas

>Signed-off-by: Laure Millet <laure.millet@lip6.fr>
>Signed-off-by: Maxime Lorrillere <maxime.lorrillere@lip6.fr>
>---
> drivers/staging/lustre/lustre/llite/namei.c |    6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/staging/lustre/lustre/llite/namei.c
>b/drivers/staging/lustre/lustre/llite/namei.c
>index 3fa529d..49f1cb0 100644
>--- a/drivers/staging/lustre/lustre/llite/namei.c
>+++ b/drivers/staging/lustre/lustre/llite/namei.c
>@@ -83,7 +83,8 @@ static int ll_set_inode(struct inode *inode, void
>*opaque)
> 
> 	lli->lli_fid = body->fid1;
> 	if (unlikely(!(body->valid & OBD_MD_FLTYPE))) {
>-		CERROR("Can not initialize inode " DFID " without object type: valid =
>%#llx\n",
>+		CERROR("Can not initialize inode " DFID
>+		       " without object type: valid = %#llx\n",
> 		       PFID(&lli->lli_fid), body->valid);
> 		return -EINVAL;
> 	}
>@@ -600,7 +601,8 @@ static int ll_atomic_open(struct inode *dir, struct
>dentry *dentry,
> 	long long lookup_flags = LOOKUP_OPEN;
> 	int rc = 0;
> 
>-	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),file %p,open_flags
>%x,mode %x opened %d\n",
>+	CDEBUG(D_VFSTRACE,
>+	       "VFS Op:name=%pd,dir=%lu/%u(%p),file %p,open_flags %x,mode %x
>opened %d\n",
> 	       dentry, dir->i_ino,
> 	       dir->i_generation, dir, file, open_flags, mode, *opened);
> 
>-- 
>1.7.10.4
>
>


Cheers, Andreas
-- 
Andreas Dilger

Lustre Software Architect
Intel High Performance Data Division

Re: [PATCH] staging: lustre: namei.c: coding style: fix 80 characters limit

[gregkh]

On Wed, Mar 18, 2015 at 07:53:35PM +0000, Dilger, Andreas wrote:
> On 2015/03/18, 1:07 PM, "Maxime Lorrillere" <maxime.lorrillere@lip6.fr>
> wrote:
> 
> >From: Laure Millet <laure.millet@lip6.fr>
> >
> >This patch fixes lines over 80 characters
> 
> I think the newer rule is that strings shouldn't be split across lines.
> That makes
> the first hunk invalid, though the second one is OK.

No, that first hunk is just fine, that horrid DFID macro allows it to
now be split :)

To fix this correctly, you need to move to using the "real" in-kernel
pr_err() functions, not custom macros.  When that happens, checkpatch.pl
will stop complaining.

I'll take this one as-is.

thanks,

greg k-h