linux-next: manual merge of the akpm-current tree with the ext3 tree

linux-next: manual merge of the akpm-current tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/notify/fanotify/fanotify_user.c between commit ff57cd5863cf
("fsnotify: Allocate overflow events with proper type") from the ext3
tree and commit c40e3490382b ("fanotify: convert access_mutex to
spinlock") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/notify/fanotify/fanotify_user.c
index 287a22c04149,c3406d633925..000000000000
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@@ -731,21 -690,9 +691,21 @@@ SYSCALL_DEFINE2(fanotify_init, unsigne
  	group->fanotify_data.user = user;
  	atomic_inc(&user->fanotify_listeners);
  
 +	oevent = kmem_cache_alloc(fanotify_event_cachep, GFP_KERNEL);
 +	if (unlikely(!oevent)) {
 +		fd = -ENOMEM;
 +		goto out_destroy_group;
 +	}
 +	group->overflow_event = &oevent->fse;
 +	fsnotify_init_event(group->overflow_event, NULL, FS_Q_OVERFLOW);
 +	oevent->tgid = get_pid(task_tgid(current));
 +	oevent->path.mnt = NULL;
 +	oevent->path.dentry = NULL;
 +
  	group->fanotify_data.f_flags = event_f_flags;
  #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
 +	oevent->response = 0;
- 	mutex_init(&group->fanotify_data.access_mutex);
+ 	spin_lock_init(&group->fanotify_data.access_lock);
  	init_waitqueue_head(&group->fanotify_data.access_waitq);
  	INIT_LIST_HEAD(&group->fanotify_data.access_list);
  	atomic_set(&group->fanotify_data.bypass_perm, 0);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the akpm-current tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/ocfs2/inode.h between commit 1c92ec678f32 ("ocfs2: Convert to
private i_dquot field") from the ext3 tree and commit eeb85794b87e
("ocfs2: fix leftover orphan entry caused by append O_DIRECT write
crash") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/ocfs2/inode.h
index ca3431ee7f24,1fdf4707e6d3..000000000000
--- a/fs/ocfs2/inode.h
+++ b/fs/ocfs2/inode.h
@@@ -81,7 -81,7 +81,9 @@@ struct ocfs2_inode_inf
  	tid_t i_sync_tid;
  	tid_t i_datasync_tid;
  
 +	struct dquot *i_dquot[MAXQUOTAS];
++
+ 	wait_queue_head_t append_dio_wq;
  };
  
  /*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the akpm-current tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3495 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got conflicts in:

  fs/notify/fanotify/fanotify.c
  fs/notify/fanotify/fanotify.h
  fs/notify/fanotify/fanotify_user.c
  fs/notify/inotify/inotify_fsnotify.c

between commits:

  1e301852d657 ("fanotify: Avoid lost events due to ENOMEM for unlimited queues")
  b900420e4109 ("fsnotify: Let userspace know about lost events due to ENOMEM")

from the ext3 tree and commit:

  d519ceef2ad6 ("fs: fsnotify: account fsnotify metadata to kmemcg")

from the akpm-current tree.

I fixed it up (see below - I simplified the obvious resolution a bit) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/notify/fanotify/fanotify.c
index d51e1bb781cf,0d9493ebc7cd..000000000000
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@@ -157,14 -148,16 +157,16 @@@ struct fanotify_event_info *fanotify_al
  	if (fanotify_is_perm_event(mask)) {
  		struct fanotify_perm_event_info *pevent;
  
- 		pevent = kmem_cache_alloc(fanotify_perm_event_cachep, gfp);
+ 		pevent = kmem_cache_alloc_memcg(fanotify_perm_event_cachep,
 -						GFP_KERNEL, memcg);
++						gfp, group->memcg);
  		if (!pevent)
  			return NULL;
  		event = &pevent->fae;
  		pevent->response = 0;
  		goto init;
  	}
- 	event = kmem_cache_alloc(fanotify_event_cachep, gfp);
 -	event = kmem_cache_alloc_memcg(fanotify_event_cachep, GFP_KERNEL,
 -				       memcg);
++	event = kmem_cache_alloc_memcg(fanotify_event_cachep, gfp,
++				       group->memcg);
  	if (!event)
  		return NULL;
  init: __maybe_unused
diff --cc fs/notify/fanotify/fanotify.h
index 8609ba06f474,51b797896c87..000000000000
--- a/fs/notify/fanotify/fanotify.h
+++ b/fs/notify/fanotify/fanotify.h
diff --cc fs/notify/fanotify/fanotify_user.c
index 72e367822efb,e5e5983051c0..000000000000
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@@ -756,8 -757,9 +757,9 @@@ SYSCALL_DEFINE2(fanotify_init, unsigne
  
  	group->fanotify_data.user = user;
  	atomic_inc(&user->fanotify_listeners);
+ 	group->memcg = get_mem_cgroup_from_mm(current->mm);
  
 -	oevent = fanotify_alloc_event(NULL, FS_Q_OVERFLOW, NULL, group->memcg);
 +	oevent = fanotify_alloc_event(group, NULL, FS_Q_OVERFLOW, NULL);
  	if (unlikely(!oevent)) {
  		fd = -ENOMEM;
  		goto out_destroy_group;
diff --cc fs/notify/inotify/inotify_fsnotify.c
index 40dedb37a1f3,ed8e7b5f3981..000000000000
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@@ -98,15 -98,9 +98,15 @@@ int inotify_handle_event(struct fsnotif
  	i_mark = container_of(inode_mark, struct inotify_inode_mark,
  			      fsn_mark);
  
- 	event = kmalloc(alloc_len, GFP_KERNEL);
+ 	event = kmalloc_memcg(alloc_len, GFP_KERNEL, group->memcg);
 -	if (unlikely(!event))
 +	if (unlikely(!event)) {
 +		/*
 +		 * Treat lost event due to ENOMEM the same way as queue
 +		 * overflow to let userspace know event was lost.
 +		 */
 +		fsnotify_queue_overflow(group);
  		return -ENOMEM;
 +	}
  
  	fsn_event = &event->fse;
  	fsnotify_init_event(fsn_event, inode, mask);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the akpm-current tree with the ext3 tree

[Jan Kara]

Hi Stephen!

On Tue 27-02-18 14:11:53, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm-current tree got conflicts in:
> 
>   fs/notify/fanotify/fanotify.c
>   fs/notify/fanotify/fanotify.h
>   fs/notify/fanotify/fanotify_user.c
>   fs/notify/inotify/inotify_fsnotify.c
> 
> between commits:
> 
>   1e301852d657 ("fanotify: Avoid lost events due to ENOMEM for unlimited queues")
>   b900420e4109 ("fsnotify: Let userspace know about lost events due to ENOMEM")
> 
> from the ext3 tree and commit:
> 
>   d519ceef2ad6 ("fs: fsnotify: account fsnotify metadata to kmemcg")
> 
> from the akpm-current tree.
> 
> I fixed it up (see below - I simplified the obvious resolution a bit) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

Thanks for the conflict resolution. It looks good!

								Honza
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR