linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Joe Perches <joe@perches.com>
Subject: Re: linux-next: manual merge of the staging tree with the vfs tree
Date: Thu, 27 Nov 2014 08:20:56 -0800	[thread overview]
Message-ID: <20141127162056.GB30533@kroah.com> (raw)
In-Reply-To: <20141127203101.346ea550@canb.auug.org.au>

On Thu, Nov 27, 2014 at 08:31:01PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 27 Nov 2014 20:11:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
> > index 7b6b9e2e0102,3b0336029da3..000000000000
> > --- a/drivers/staging/lustre/lustre/llite/llite_lib.c
> > +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
> > @@@ -698,8 -690,10 +690,8 @@@ void lustre_dump_dentry(struct dentry *
> >   	list_for_each(tmp, &dentry->d_subdirs)
> >   		subdirs++;
> >   
> > - 	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"
> > - 	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,
> >  -	CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
> >  -	       dentry,
> >  -	       dentry->d_name.len, dentry->d_name.name,
> >  -	       dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
> > ++	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
> > ++	       dentry, dentry,
> >   	       dentry->d_parent, dentry->d_inode, d_count(dentry),
> >   	       dentry->d_flags, dentry->d_fsdata, subdirs);
> >   	if (dentry->d_inode != NULL)
> 
> The actual resolution for this file ended up being this:
> 
> diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
> index 7b6b9e2e0102,3b0336029da3..52f0a7e40063
> --- a/drivers/staging/lustre/lustre/llite/llite_lib.c
> +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
> @@@ -698,8 -690,10 +690,8 @@@ void lustre_dump_dentry(struct dentry *
>   	list_for_each(tmp, &dentry->d_subdirs)
>   		subdirs++;
>   
> - 	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"
> - 	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,
>  -	CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
>  -	       dentry,
>  -	       dentry->d_name.len, dentry->d_name.name,
>  -	       dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
> ++	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
> ++	       dentry, dentry,
>   	       dentry->d_parent, dentry->d_inode, d_count(dentry),
>   	       dentry->d_flags, dentry->d_fsdata, subdirs);
>   	if (dentry->d_inode != NULL)
> @@@ -709,7 -703,8 +701,8 @@@
>   		return;
>   
>   	list_for_each(tmp, &dentry->d_subdirs) {
>  -		struct dentry *d = list_entry(tmp, struct dentry, d_u.d_child);
>  +		struct dentry *d = list_entry(tmp, struct dentry, d_child);
> + 
>   		lustre_dump_dentry(d, recur - 1);
>   	}
>   }

Looks good, thanks.

greg k-h

  reply	other threads:[~2014-11-27 16:22 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-27  9:11 linux-next: manual merge of the staging tree with the vfs tree Stephen Rothwell
2014-11-27  9:31 ` Stephen Rothwell
2014-11-27 16:20   ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-12  5:16 Stephen Rothwell
2020-03-12  7:36 ` Greg KH
2018-10-09  4:59 Stephen Rothwell
2018-10-09  9:18 ` Greg KH
2018-03-13  4:22 Stephen Rothwell
2018-03-13  8:47 ` Greg KH
2017-12-04  2:06 Stephen Rothwell
2017-12-04  9:10 ` Greg KH
2017-12-04  1:58 Stephen Rothwell
2017-12-04  9:09 ` Greg KH
2017-11-09  4:01 Stephen Rothwell
2017-11-09  8:34 ` Greg KH
2016-12-12  4:21 Stephen Rothwell
2016-09-20  5:03 Stephen Rothwell
2016-09-20 11:14 ` Greg KH
2016-05-03  6:44 Stephen Rothwell
2016-05-03 18:19 ` Greg KH
2014-12-15  4:06 Stephen Rothwell
2014-11-03  2:39 Stephen Rothwell
2014-11-03  2:31 Stephen Rothwell
2014-11-03  2:29 Stephen Rothwell
2014-11-03 23:57 ` Greg KH
2013-04-10  5:54 Stephen Rothwell
2013-04-10 14:57 ` Greg KH
2013-04-04  4:43 Stephen Rothwell
2013-04-05  1:44 ` Greg KH
2013-04-04  4:40 Stephen Rothwell
2013-04-05  1:45 ` Greg KH
2013-04-04  4:34 Stephen Rothwell
2013-04-05  1:45 ` Greg KH
2012-09-24  7:07 Stephen Rothwell
2012-09-25 22:38 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141127162056.GB30533@kroah.com \
    --to=greg@kroah.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=viro@ZenIV.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).