lkml.org 
[lkml]   [2018]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subjectlinux-next: merge conflict between vfs for-next and overlayfs-next
Hi Stephen, Al, Miklos,

I noticed that the vfs tree for-next branch is not yet in linux-next and
has a merge conflict with overlayfs-next branch, already in linux-next.

This is a trivial conflict due to the fact that commit f9c34674bc60 ("vfs:
factor out helpers d_instantiate_anon() and d_alloc_anon()") refactors
__d_obtain_alias() and changes the variable name from 'tmp' to 'dentry'.

Below is the patch to resolve the conflict when merging vfs for-next
onto overlayfs-next.
Probably best if Al picks up the re-factoring patch to his tree anyway.

Thanks,
Amir.

---

--- fs/dcache.c
+++ fs/dcache.c
@@ -1957,9 +1963,11 @@ static struct dentry
*__d_instantiate_anon(struct dentry *dentry,
spin_lock(&dentry->d_lock);
__d_set_inode_and_type(dentry, inode, add_flags);
hlist_add_head(&dentry->d_u.d_alias, &inode->i_dentry);
- hlist_bl_lock(&dentry->d_sb->s_anon);
- hlist_bl_add_head(&dentry->d_hash, &dentry->d_sb->s_anon);
- hlist_bl_unlock(&dentry->d_sb->s_anon);
+ if (!disconnected) {
+ hlist_bl_lock(&dentry->d_sb->s_roots);
+ hlist_bl_add_head(&dentry->d_hash, &dentry->d_sb->s_roots);
+ hlist_bl_unlock(&dentry->d_sb->s_roots);
+ }
spin_unlock(&dentry->d_lock);
spin_unlock(&inode->i_lock);
\
 
 \ /
  Last update: 2018-01-26 15:44    [W:0.025 / U:0.268 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site