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

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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: pgpxd5_b8iJDa.pgp
Description: PGP signature