[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1323901667-3746-1-git-send-email-maxim.uvarov@oracle.com>
Date: Wed, 14 Dec 2011 14:27:47 -0800
From: Maxim Uvarov <maxim.uvarov@...cle.com>
To: linux-kernel@...r.kernel.org
Cc: linux-fsdevel@...r.kernel.org,
Maxim Uvarov <maxim.uvarov@...cle.com>
Subject: [PATCH] NFS/INOTIFY: inotify user when deleting files on nfs
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@...cle.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists