The patch titled
Subject: nfs/inotify: inotify user when deleting files on nfs
has been removed from the -mm tree. Its filename was
nfs-inotify-inotify-user-when-deleting-files-on-nfs.patch
This patch was dropped because it was withdrawn
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Maxim Uvarov <maxim.uvarov@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: Chuck Lever <chuck.lever@xxxxxxxxxx>
Cc: Eric Paris <eparis@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/namei.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff -puN fs/namei.c~nfs-inotify-inotify-user-when-deleting-files-on-nfs fs/namei.c
--- a/fs/namei.c~nfs-inotify-inotify-user-when-deleting-files-on-nfs
+++ a/fs/namei.c
@@ -2850,10 +2850,23 @@ int vfs_unlink(struct inode *dir, struct
}
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;
_
Patches currently in -mm which might be from maxim.uvarov@xxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
