linux-next: manual merge of the fsnotify tree with Linus' tree

* linux-next: manual merge of the fsnotify tree with Linus' tree
@ 2010-10-28  1:38 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2010-10-28  1:38 UTC (permalink / raw)
  To: Eric Paris; +Cc: linux-next, linux-kernel, Christoph Hellwig, Al Viro

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
fs/notify/fsnotify.c between commit
4d4eb36679adbdd75495e1bbfe7ac40e4ae41dea ("fsnotify: use dget_parent")
from Linus' tree and commit b14be22c572d5d98e2ffebf63e2d1aa1f088875b
("fsnotify: call fsnotify_parent in perm events") from the fsnotify tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/notify/fsnotify.c
index 4498a20,f3f6aa7..0000000

--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@@ -88,32 -88,58 +88,35 @@@ int __fsnotify_parent(struct path *path
  {
  	struct dentry *parent;
  	struct inode *p_inode;
 -	bool send = false;
 -	bool should_update_children = false;
+ 	int ret = 0;
  
  	if (!dentry)
  		dentry = path->dentry;
  
  	if (!(dentry->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED))
- 		return;
+ 		return 0;
  
 -	spin_lock(&dentry->d_lock);
 -	parent = dentry->d_parent;
 +	parent = dget_parent(dentry);
  	p_inode = parent->d_inode;
  
 -	if (fsnotify_inode_watches_children(p_inode)) {
 -		if (p_inode->i_fsnotify_mask & mask) {
 -			dget(parent);
 -			send = true;
 -		}
 -	} else {
 -		/*
 -		 * The parent doesn't care about events on it's children but
 -		 * at least one child thought it did.  We need to run all the
 -		 * children and update their d_flags to let them know p_inode
 -		 * doesn't care about them any more.
 -		 */
 -		dget(parent);
 -		should_update_children = true;
 -	}
 -
 -	spin_unlock(&dentry->d_lock);
 -
 -	if (send) {
 +	if (unlikely(!fsnotify_inode_watches_children(p_inode)))
 +		__fsnotify_update_child_dentry_flags(p_inode);
 +	else if (p_inode->i_fsnotify_mask & mask) {
  		/* we are notifying a parent so come up with the new mask which
  		 * specifies these are events which came from a child. */
  		mask |= FS_EVENT_ON_CHILD;
  
  		if (path)
- 			fsnotify(p_inode, mask, path, FSNOTIFY_EVENT_PATH,
- 				 dentry->d_name.name, 0);
+ 			ret = fsnotify(p_inode, mask, path, FSNOTIFY_EVENT_PATH,
+ 				       dentry->d_name.name, 0);
  		else
- 			fsnotify(p_inode, mask, dentry->d_inode, FSNOTIFY_EVENT_INODE,
- 				 dentry->d_name.name, 0);
+ 			ret = fsnotify(p_inode, mask, dentry->d_inode, FSNOTIFY_EVENT_INODE,
+ 				       dentry->d_name.name, 0);
 -		dput(parent);
  	}
  
 -	if (unlikely(should_update_children)) {
 -		__fsnotify_update_child_dentry_flags(p_inode);
 -		dput(parent);
 -	}
 +	dput(parent);
+ 
+ 	return ret;
  }
  EXPORT_SYMBOL_GPL(__fsnotify_parent);
  

^ permalink raw reply	[flat|nested] 4+ messages in thread