linux-next: manual merge of the fsnotify tree with the vfs tree

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
include/linux/fsnotify.h between commit
8471c0d4ecfe882d76bcb99f941f6ac7d46e2ec0 ("Lose the first argument of
audit_inode_child()") from the vfs tree and commit
3c33b75b9aa83f6db59f5d880f881807519ad84d ("inotify: remove inotify in
kernel interface") from the fsnotify tree.

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

diff --cc include/linux/fsnotify.h
index df8fd9a,8db6857..0000000
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@@ -87,24 -96,13 +97,13 @@@ static inline void fsnotify_move(struc
  	fsnotify(old_dir, old_dir_mask, old_dir, FSNOTIFY_EVENT_INODE, old_name, fs_cookie);
  	fsnotify(new_dir, new_dir_mask, new_dir, FSNOTIFY_EVENT_INODE, new_name, fs_cookie);
  
- 	if (target) {
- 		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL, NULL);
- 		inotify_inode_is_dead(target);
- 
- 		/* this is really a link_count change not a removal */
+ 	if (target)
  		fsnotify_link_count(target);
- 	}
  
- 	if (source) {
- 		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL, NULL);
+ 	if (source)
  		fsnotify(source, FS_MOVE_SELF, moved->d_inode, FSNOTIFY_EVENT_INODE, NULL, 0);
- 	}
+ 
 -	audit_inode_child(new_name, moved, new_dir);
 +	audit_inode_child(moved, new_dir);
  }
  
  /*
@@@ -145,9 -148,7 +149,7 @@@ static inline void fsnotify_inoderemove
   */
  static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
  {
- 	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name,
- 				  dentry->d_inode);
 -	audit_inode_child(dentry->d_name.name, dentry, inode);
 +	audit_inode_child(dentry, inode);
  
  	fsnotify(inode, FS_CREATE, dentry->d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0);
  }
@@@ -159,10 -160,8 +161,8 @@@
   */
  static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct dentry *new_dentry)
  {
- 	inotify_inode_queue_event(dir, IN_CREATE, 0, new_dentry->d_name.name,
- 				  inode);
  	fsnotify_link_count(inode);
 -	audit_inode_child(new_dentry->d_name.name, new_dentry, dir);
 +	audit_inode_child(new_dentry, dir);
  
  	fsnotify(dir, FS_CREATE, inode, FSNOTIFY_EVENT_INODE, new_dentry->d_name.name, 0);
  }
@@@ -175,8 -174,7 +175,7 @@@ static inline void fsnotify_mkdir(struc
  	__u32 mask = (FS_CREATE | FS_IN_ISDIR);
  	struct inode *d_inode = dentry->d_inode;
  
- 	inotify_inode_queue_event(inode, mask, 0, dentry->d_name.name, d_inode);
 -	audit_inode_child(dentry->d_name.name, dentry, inode);
 +	audit_inode_child(dentry, inode);
  
  	fsnotify(inode, mask, d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0);
  }

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
include/linux/fs.h between commit
6d125529c6cbfe570ce3bf9a0728548f087499da ("Fix ACC_MODE() for real") from
the vfs tree and commit 8b006ddbcdc223f1053ab98dfa5460cd4ecd27b9 ("vfs:
introduce FMODE_NONOTIFY") 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 include/linux/fs.h
index 416b8bd,d6190a8..0000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2461,8 -2460,9 +2459,9 @@@ int proc_nr_files(struct ctl_table *tab
  
  int __init get_filesystem_list(char *buf);
  
 -#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
 +#define ACC_MODE(x) ("\004\002\006\006"[(x)&O_ACCMODE])
- #define OPEN_FMODE(flag) ((__force fmode_t)((flag + 1) & O_ACCMODE))
+ #define OPEN_FMODE(flag) ((__force fmode_t)(((flag + 1) & O_ACCMODE) | \
+ 					    (flag & FMODE_NONOTIFY)))
  
  #endif /* __KERNEL__ */
  #endif /* _LINUX_FS_H */

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
kernel/audit_tree.c between commit
1a527a2c261ad15dd15d5ee7763d3afcd8c084e9 ("new helper: iterate_mounts()")
from the vfs tree and commits 0bb4b47eebb9d06546c9beae77dc283fbb43ea35
("audit: reimplement audit_trees using fsnotify rather than inotify")
and 98d4301cc7c8828ea41432a62a3216212ffda250 ("fsnotify: put inode
specific fields in an fsnotify_mark in a union") from the fsnotify tree.

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

diff --cc kernel/audit_tree.c
index 028e856,a9167f9..0000000
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@@ -581,12 -594,20 +598,13 @@@ void audit_trim_trees(void
  		if (!root_mnt)
  			goto skip_it;
  
 -		list_add_tail(&list, &root_mnt->mnt_list);
  		spin_lock(&hash_lock);
  		list_for_each_entry(node, &tree->chunks, list) {
- 			struct inode *inode = find_chunk(node)->watch.inode;
 -			struct audit_chunk *chunk = find_chunk(node);
+ 			/* this could be NULL if the watch is dieing else where... */
 -			struct inode *inode = chunk->mark.i.inode;
 -			struct vfsmount *mnt;
++			struct inode *inode = find_chunk(node)->mark.i.inode;
  			node->index |= 1U<<31;
 -			list_for_each_entry(mnt, &list, mnt_list) {
 -				if (mnt->mnt_root->d_inode == inode) {
 -					node->index &= ~(1U<<31);
 -					break;
 -				}
 -			}
 +			if (iterate_mounts(compare_root, inode, root_mnt))
 +				node->index &= ~(1U<<31);
  		}
  		spin_unlock(&hash_lock);
  		trim_marked(tree);

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

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

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
fs/namei.c between commit 123df2944c436c80640c4281c5bc9c7950b18687 ("Lose
the new_name argument of fsnotify_move()") from the vfs tree and commit
2df5764e29a813f6ba63be094ab8aadc704a78fd ("fsnotify: use unsigned char *
for dentry->d_name.name") from the fsnotify tree.

The former removed the code changed by the latter, so I used the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
include/linux/fsnotify.h between commits
123df2944c436c80640c4281c5bc9c7950b18687 ("Lose the new_name argument of
fsnotify_move()") and cccc6bba3f771ef29b33e4f79e70ebc3dba245b0 ("Lose the
first argument of audit_inode_child()") from the vfs tree and commits
8b37e6e1cdff433157a7ac8448789e23d0f581b9 ("inotify: remove inotify in
kernel interface") and 2df5764e29a813f6ba63be094ab8aadc704a78fd
("fsnotify: use unsigned char * for dentry->d_name.name") from the
fsnotify tree.

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

diff --cc include/linux/fsnotify.h
index df8fd9a,bd99bf5..0000000
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@@ -65,11 -77,12 +77,10 @@@ static inline void fsnotify_link_count(
   * fsnotify_move - file old_name at old_dir was moved to new_name at new_dir
   */
  static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
- 				 const char *old_name,
+ 				 const unsigned char *old_name,
 -				 const unsigned char *new_name,
 -				 int isdir, struct inode *target,
 -				 struct dentry *moved)
 +				 int isdir, struct inode *target, struct dentry *moved)
  {
  	struct inode *source = moved->d_inode;
- 	u32 in_cookie = inotify_get_cookie();
  	u32 fs_cookie = fsnotify_get_cookie();
  	__u32 old_dir_mask = (FS_EVENT_ON_CHILD | FS_MOVED_FROM);
  	__u32 new_dir_mask = (FS_EVENT_ON_CHILD | FS_MOVED_TO);
@@@ -87,24 -98,13 +97,12 @@@
  	fsnotify(old_dir, old_dir_mask, old_dir, FSNOTIFY_EVENT_INODE, old_name, fs_cookie);
  	fsnotify(new_dir, new_dir_mask, new_dir, FSNOTIFY_EVENT_INODE, new_name, fs_cookie);
  
- 	if (target) {
- 		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL, NULL);
- 		inotify_inode_is_dead(target);
- 
- 		/* this is really a link_count change not a removal */
+ 	if (target)
  		fsnotify_link_count(target);
- 	}
  
- 	if (source) {
- 		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL, NULL);
+ 	if (source)
  		fsnotify(source, FS_MOVE_SELF, moved->d_inode, FSNOTIFY_EVENT_INODE, NULL, 0);
- 	}
 -
 -	audit_inode_child(new_name, moved, new_dir);
 +	audit_inode_child(moved, new_dir);
  }
  
  /*
@@@ -145,9 -150,7 +148,7 @@@ static inline void fsnotify_inoderemove
   */
  static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
  {
- 	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name,
- 				  dentry->d_inode);
 -	audit_inode_child(dentry->d_name.name, dentry, inode);
 +	audit_inode_child(dentry, inode);
  
  	fsnotify(inode, FS_CREATE, dentry->d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0);
  }
@@@ -159,10 -162,8 +160,8 @@@
   */
  static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct dentry *new_dentry)
  {
- 	inotify_inode_queue_event(dir, IN_CREATE, 0, new_dentry->d_name.name,
- 				  inode);
  	fsnotify_link_count(inode);
 -	audit_inode_child(new_dentry->d_name.name, new_dentry, dir);
 +	audit_inode_child(new_dentry, dir);
  
  	fsnotify(dir, FS_CREATE, inode, FSNOTIFY_EVENT_INODE, new_dentry->d_name.name, 0);
  }
@@@ -175,8 -176,7 +174,7 @@@ static inline void fsnotify_mkdir(struc
  	__u32 mask = (FS_CREATE | FS_IN_ISDIR);
  	struct inode *d_inode = dentry->d_inode;
  
- 	inotify_inode_queue_event(inode, mask, 0, dentry->d_name.name, d_inode);
 -	audit_inode_child(dentry->d_name.name, dentry, inode);
 +	audit_inode_child(dentry, inode);
  
  	fsnotify(inode, mask, d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0);
  }

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

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

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
kernel/auditsc.c between commit cccc6bba3f771ef29b33e4f79e70ebc3dba245b0
("Lose the first argument of audit_inode_child()") from the vfs tree and
commit 2df5764e29a813f6ba63be094ab8aadc704a78fd ("fsnotify: use unsigned
char * for dentry->d_name.name") from the fsnotify tree.

The former removed the code changed by the latter, so I used the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

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

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
include/linux/audit.h between commit
cccc6bba3f771ef29b33e4f79e70ebc3dba245b0 ("Lose the first argument of
audit_inode_child()") from the vfs tree and commit
2df5764e29a813f6ba63be094ab8aadc704a78fd ("fsnotify: use unsigned char *
for dentry->d_name.name") from the fsnotify tree.

The former removed the bits changed by the latter, so I used the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Al Viro]

On Tue, Feb 09, 2010 at 04:37:08PM +1100, Stephen Rothwell wrote:
> Hi Eric,
> 
> Today's linux-next merge of the fsnotify tree got a conflict in
> fs/namei.c between commit 123df2944c436c80640c4281c5bc9c7950b18687 ("Lose
> the new_name argument of fsnotify_move()") from the vfs tree and commit
> 2df5764e29a813f6ba63be094ab8aadc704a78fd ("fsnotify: use unsigned char *
> for dentry->d_name.name") from the fsnotify tree.
> 
> The former removed the code changed by the latter, so I used the former.

FWIW, I've put two commits (audit_inode_child and fsnotify_move ones) into
a new not-for-rebase branch (for-fsnotify) and told Eric, so hopefully
he'll just pull it into fsnotify tree.

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

[Stephen Rothwell]

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

Hi Al,

On Tue, 9 Feb 2010 05:45:22 +0000 Al Viro <viro@ZenIV.linux.org.uk> wrote:
>
> FWIW, I've put two commits (audit_inode_child and fsnotify_move ones) into
> a new not-for-rebase branch (for-fsnotify) and told Eric, so hopefully
> he'll just pull it into fsnotify tree.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Eric Paris]

On Tue, 2010-02-09 at 05:45 +0000, Al Viro wrote:
> On Tue, Feb 09, 2010 at 04:37:08PM +1100, Stephen Rothwell wrote:
> > Hi Eric,
> > 
> > Today's linux-next merge of the fsnotify tree got a conflict in
> > fs/namei.c between commit 123df2944c436c80640c4281c5bc9c7950b18687 ("Lose
> > the new_name argument of fsnotify_move()") from the vfs tree and commit
> > 2df5764e29a813f6ba63be094ab8aadc704a78fd ("fsnotify: use unsigned char *
> > for dentry->d_name.name") from the fsnotify tree.
> > 
> > The former removed the code changed by the latter, so I used the former.
> 
> FWIW, I've put two commits (audit_inode_child and fsnotify_move ones) into
> a new not-for-rebase branch (for-fsnotify) and told Eric, so hopefully
> he'll just pull it into fsnotify tree.

I know I merged it yesterday, but now I can't for the life of me find
the branch I merged it onto, obviously it wasn't my for-next branch.
I'm so confused.  Anyway, yes, I'll merge it again right now.....

-Eric

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
fs/notify/inotify/inotify_user.c between commit
9f009a78fb3b54976cfe8173d05ef483dbda4571 ("switch inotify_user to
anon_inode") from the vfs tree and commit
9036fe89f12afba49cd3e5b44b2f94fbd3269269 ("inotify: rename mark_entry to
just mark") 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/inotify/inotify_user.c
index 472cdf2,bc1f395..0000000
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@@ -767,7 -873,17 +836,7 @@@ out
   */
  static int __init inotify_user_setup(void)
  {
- 	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark_entry, SLAB_PANIC);
 -	int ret;
 -
 -	ret = register_filesystem(&inotify_fs_type);
 -	if (unlikely(ret))
 -		panic("inotify: register_filesystem returned %d!\n", ret);
 -
 -	inotify_mnt = kern_mount(&inotify_fs_type);
 -	if (IS_ERR(inotify_mnt))
 -		panic("inotify: kern_mount ret %ld!\n", PTR_ERR(inotify_mnt));
 -
+ 	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark, SLAB_PANIC);
  	event_priv_cachep = KMEM_CACHE(inotify_event_private_data, SLAB_PANIC);
  
  	inotify_max_queued_events = 16384;

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

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

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
include/linux/fsnotify.h between commit
cccc6bba3f771ef29b33e4f79e70ebc3dba245b0 ("Lose the first argument of
audit_inode_child()") from the vfs tree and commits
a65c9effb4c7b86d032b5188ddbd0e2e583cb81b ("inotify: remove inotify in
kernel interface"), 76864b426a99a3d08aa53e554ddc748ac49ca633 ("Lose the
first argument of audit_inode_child()") and
7278f4df3bfbc7934fc590d8a5707d3a8ee3d866 ("fsnotify: use unsigned char *
for dentry->d_name.name") from the fsnotify tree.

This has come about partly because, when you rebased and linearized your
tree, you included inline the two patches from Al that he had put in a
separate branch for you to merge.  You should have just remerged Al's
for-fsnotify branch at the appropriate place in your tree.

I fixed it up (again) and can carry this for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the fsnotify tree with the vfs tree

[Stephen Rothwell]

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

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
fs/notify/inotify/inotify.c between commits
f3ffc7acb6a6ebec0a9e660d9211ed048d7e90f5 ("get rid of S_BIAS") and
73b38e074b51e5d8d2801691dff6e403631e927f ("Saner locking around
deactivate_super()") from the vfs tree and commit
b6bacae18f2f7722df9e8e516ed77b2815bd1ac7 ("inotify: remove inotify in
kernel interface") from the fsnotify tree.

The latter just removed the file, so I did that as well.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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