From: Eric Paris <eparis@redhat.com>
To: torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Subject: [GIT PULL] notification tree changes for 3.8
Date: Thu, 20 Dec 2012 17:38:58 -0500 [thread overview]
Message-ID: <1356043138.2592.10.camel@localhost> (raw)
[-- Attachment #1: Type: text/plain, Size: 3048 bytes --]
I believe you would get a build failure after this pull due to the
addition of procfs information for *notify fds. The attached patch from
sfr should be applied during the merge to change the spin_lock in that
patch to the mutex in this patch.
This pull mostly is about locking changes in the fsnotify system. By
switching the group lock from a spin_lock() to a mutex() we can now hold
the lock across things like iput(). This fixes a problem involving
unmounting a fs and having inodes be busy, first pointed out by FAT, but
reproducible with tmpfs.
This also restores signal driven I/O for inotify, which has been broken
since about 2.6.32.
$ git request-pull v3.6 git://git.infradead.org/users/eparis/notify.git
The following changes since commit a0d271cbfed1dd50278c6b06bead3d00ba0a88f9:
Linux 3.6 (2012-09-30 16:47:46 -0700)
are available in the git repository at:
git://git.infradead.org/users/eparis/notify.git for-next
for you to fetch changes up to 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06:
inotify: automatically restart syscalls (2012-12-11 13:44:37 -0500)
----------------------------------------------------------------
Eric Paris (2):
fsnotify: make fasync generic for both inotify and fanotify
inotify: automatically restart syscalls
Lino Sanfilippo (12):
inotify, fanotify: replace fsnotify_put_group() with fsnotify_destroy_group()
fsnotify: introduce fsnotify_get_group()
fsnotify: use reference counting for groups
fsnotify: take groups mark_lock before mark lock
fanotify: add an extra flag to mark_remove_from_mask that indicates wheather a mark should be destroyed
fsnotify: use a mutex instead of a spinlock to protect a groups mark list
fsnotify: pass group to fsnotify_destroy_mark()
fsnotify: introduce locked versions of fsnotify_add_mark() and fsnotify_remove_mark()
fsnotify: dont put marks on temporary list when clearing marks by group
fsnotify: change locking order
fanotify: dont merge permission events
inotify: dont skip removal of watch descriptor if creation of ignored event failed
fs/notify/dnotify/dnotify.c | 4 ++--
fs/notify/fanotify/fanotify.c | 6 ++++++
fs/notify/fanotify/fanotify_user.c | 37 +++++++++++++++++++++++++------------
fs/notify/group.c | 47 +++++++++++++++++++++++++++--------------------
fs/notify/inode_mark.c | 14 +++++++++++---
fs/notify/inotify/inotify_fsnotify.c | 4 +++-
fs/notify/inotify/inotify_user.c | 34 ++++++++++++++--------------------
fs/notify/mark.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------
fs/notify/notification.c | 1 +
fs/notify/vfsmount_mark.c | 14 +++++++++++---
include/linux/fsnotify_backend.h | 31 +++++++++++++++++++++----------
kernel/audit_tree.c | 10 +++++-----
kernel/audit_watch.c | 4 ++--
13 files changed, 178 insertions(+), 119 deletions(-)
[-- Attachment #2: tmp.patch --]
[-- Type: text/x-patch, Size: 819 bytes --]
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Dec 2012 11:53:20 +1100
Subject: [PATCH] fsnotify: cope with change from spinlock to mutex
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/notify/fdinfo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c
index 514c4b8..238a593 100644
--- a/fs/notify/fdinfo.c
+++ b/fs/notify/fdinfo.c
@@ -27,13 +27,13 @@ static int show_fdinfo(struct seq_file *m, struct file *f,
struct fsnotify_mark *mark;
int ret = 0;
- spin_lock(&group->mark_lock);
+ mutex_lock(&group->mark_mutex);
list_for_each_entry(mark, &group->marks_list, g_list) {
ret = show(m, mark);
if (ret)
break;
}
- spin_unlock(&group->mark_lock);
+ mutex_unlock(&group->mark_mutex);
return ret;
}
next reply other threads:[~2012-12-20 22:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-20 22:38 Eric Paris [this message]
2012-12-21 1:50 ` [GIT PULL] notification tree changes for 3.8 Linus Torvalds
2012-12-21 2:49 ` Eric Paris
2012-12-21 4:00 ` Linus Torvalds
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=1356043138.2592.10.camel@localhost \
--to=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).