Re: linux-next: manual merge of the staging tree with the vfs tree

[Greg KH]

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@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/