Skip to content

Commit

Permalink
fsnotify: fsnotify marks on inodes pin them in core
Browse files Browse the repository at this point in the history
This patch pins any inodes with an fsnotify mark in core.  The idea is that
as soon as the mark is removed from the inode->fsnotify_mark_entries list
the inode will be iput.  In reality is doesn't quite work exactly this way.
The igrab will happen when the mark is added to an inode, but the iput will
happen when the inode pointer is NULL'd inside the mark.

It's possible that 2 racing things will try to remove the mark from
different directions.  One may try to remove the mark because of an
explicit request and one might try to remove it because the inode was
deleted.  It's possible that the removal because of inode deletion will
remove the mark from the inode's list, but the removal by explicit request
will actually set entry->inode == NULL; and call the iput.  This is safe.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Eric Paris committed Jun 11, 2009
1 parent e4aff11 commit 1ef5f13
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions fs/notify/inode_mark.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry)
*/


iput(inode);

/*
* it's possible that this group tried to destroy itself, but this
* this mark was simultaneously being freed by inode. If that's the
Expand Down Expand Up @@ -306,6 +308,10 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
struct fsnotify_mark_entry *lentry;
int ret = 0;

inode = igrab(inode);
if (unlikely(!inode))
return -EINVAL;

/*
* LOCKING ORDER!!!!
* entry->lock
Expand Down Expand Up @@ -337,6 +343,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,

if (lentry) {
ret = -EEXIST;
iput(inode);
fsnotify_put_mark(lentry);
} else {
__fsnotify_update_child_dentry_flags(inode);
Expand Down

0 comments on commit 1ef5f13

Please sign in to comment.