public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Eric Paris <eparis@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Al Viro <viro@zeniv•linux.org.uk>
Subject: linux-next: manual merge of the fsnotify tree with the vfs tree
Date: Tue, 2 Feb 2010 15:26:05 +1100	[thread overview]
Message-ID: <20100202152605.656c26b2.sfr@canb.auug.org.au> (raw)

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);

next             reply	other threads:[~2010-02-02  4:26 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-02  4:26 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-05-18  5:10 linux-next: manual merge of the fsnotify tree with the vfs tree Stephen Rothwell
2010-03-04  4:46 Stephen Rothwell
2010-02-15  6:56 Stephen Rothwell
2010-02-09  5:37 Stephen Rothwell
2010-02-09  5:37 Stephen Rothwell
2010-02-09  5:37 Stephen Rothwell
2010-02-09  5:37 Stephen Rothwell
2010-02-09  5:45 ` Al Viro
2010-02-09  6:08   ` Stephen Rothwell
2010-02-09 13:02   ` Eric Paris
2010-01-18  6:29 Stephen Rothwell
2010-01-18  6:29 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100202152605.656c26b2.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=eparis@redhat$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=viro@zeniv$(echo .)linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox