From: Maxim Uvarov <maxim.uvarov@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, Maxim Uvarov <maxim.uvarov@oracle.com>
Subject: [PATCH] NFS/INOTIFY: inotify user when deleting files on nfs
Date: Wed, 14 Dec 2011 14:27:47 -0800 [thread overview]
Message-ID: <1323901667-3746-1-git-send-email-maxim.uvarov@oracle.com> (raw)
This issue was introduced with LTP inotify02 test.
If file system is not NFS user inotify application
gets IN_DELETE event. But on NFS code avoids d_delete()
which sends this event. This patch makes notification
on NFS the same as non-NFS. I.e. vfs_unlink still avoids
deletion but it sends event for NFS sillyrenamed files.
More details here:
https://lkml.org/lkml/2011/11/29/421
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---
fs/namei.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index a9a7166..44a997e 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2737,10 +2737,23 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
}
mutex_unlock(&dentry->d_inode->i_mutex);
- /* We don't d_delete() NFS sillyrenamed files--they still exist. */
- if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) {
+
+ if (!error) {
fsnotify_link_count(dentry->d_inode);
- d_delete(dentry);
+ if (!(dentry->d_flags & DCACHE_NFSFS_RENAMED))
+ d_delete(dentry);
+ else {
+ /* We don't d_delete() NFS sillyrenamed files - they
+ * still exist. But from user side this file was
+ * deleted. So that we need to generate notify event
+ * about it.
+ */
+ struct inode *inode;
+ int isdir;
+ inode = dentry->d_inode;
+ isdir = S_ISDIR(inode->i_mode);
+ fsnotify_nameremove(dentry, isdir);
+ }
}
return error;
--
1.7.4.1
next reply other threads:[~2011-12-14 22:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-14 22:27 Maxim Uvarov [this message]
[not found] ` <1323901667-3746-1-git-send-email-maxim.uvarov-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2011-12-15 10:42 ` [PATCH] NFS/INOTIFY: inotify user when deleting files on nfs Boaz Harrosh
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=1323901667-3746-1-git-send-email-maxim.uvarov@oracle.com \
--to=maxim.uvarov@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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).