The patch titled Subject: fs, notify: add file handle entry into inotify_inode_mark has been removed from the -mm tree. Its filename was fs-notify-add-file-handle-entry-into-inotify_inode_mark.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Subject: fs, notify: add file handle entry into inotify_inode_mark This file handle will be used in /proc/pid/fdinfo/fd output, which in turn will allow to restore a watch target after checkpoint (thus it's provided for CONFIG_CHECKPOINT_RESTORE only). Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: James Bottomley <jbottomley@xxxxxxxxxxxxx> Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Matthew Helsley <matt.helsley@xxxxxxxxx> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/notify/inotify/inotify.h | 8 +++++ fs/notify/inotify/inotify_user.c | 42 +++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 5 deletions(-) diff -puN fs/notify/inotify/inotify.h~fs-notify-add-file-handle-entry-into-inotify_inode_mark fs/notify/inotify/inotify.h --- a/fs/notify/inotify/inotify.h~fs-notify-add-file-handle-entry-into-inotify_inode_mark +++ a/fs/notify/inotify/inotify.h @@ -1,6 +1,7 @@ #include <linux/fsnotify_backend.h> #include <linux/inotify.h> #include <linux/slab.h> /* struct kmem_cache */ +#include <linux/exportfs.h> extern struct kmem_cache *event_priv_cachep; @@ -9,9 +10,16 @@ struct inotify_event_private_data { int wd; }; +#if defined(CONFIG_PROC_FS) && defined(CONFIG_EXPORTFS) && defined(CONFIG_CHECKPOINT_RESTORE) +# define INOTIFY_USE_FHANDLE +#endif + struct inotify_inode_mark { struct fsnotify_mark fsn_mark; int wd; +#ifdef INOTIFY_USE_FHANDLE + __u8 fhandle[sizeof(struct file_handle) + MAX_HANDLE_SZ]; +#endif }; extern void inotify_ignored_and_remove_idr(struct fsnotify_mark *fsn_mark, diff -puN fs/notify/inotify/inotify_user.c~fs-notify-add-file-handle-entry-into-inotify_inode_mark fs/notify/inotify/inotify_user.c --- a/fs/notify/inotify/inotify_user.c~fs-notify-add-file-handle-entry-into-inotify_inode_mark +++ a/fs/notify/inotify/inotify_user.c @@ -561,6 +561,33 @@ static void inotify_free_mark(struct fsn kmem_cache_free(inotify_inode_mark_cachep, i_mark); } +#ifdef INOTIFY_USE_FHANDLE +static int inotify_encode_wd_fhandle(struct inotify_inode_mark *mark, struct dentry *dentry) +{ + struct file_handle *fhandle = (struct file_handle *)mark->fhandle; + int size, ret; + + BUILD_BUG_ON(sizeof(mark->fhandle) <= sizeof(struct file_handle)); + + fhandle->handle_bytes = sizeof(mark->fhandle) - sizeof(struct file_handle); + size = fhandle->handle_bytes >> 2; + + ret = exportfs_encode_fh(dentry, (struct fid *)fhandle->f_handle, &size, 0); + if ((ret == 255) || (ret == -ENOSPC)) + return -EOVERFLOW; + + fhandle->handle_type = ret; + fhandle->handle_bytes = size * sizeof(u32); + + return 0; +} +# else +static int inotify_encode_wd_fhandle(struct inotify_inode_mark *mark, struct dentry *dentry) +{ + return 0; +} +#endif + static int inotify_update_existing_watch(struct fsnotify_group *group, struct inode *inode, u32 arg) @@ -616,10 +643,11 @@ static int inotify_update_existing_watch } static int inotify_new_watch(struct fsnotify_group *group, - struct inode *inode, + struct dentry *dentry, u32 arg) { struct inotify_inode_mark *tmp_i_mark; + struct inode *inode = dentry->d_inode; __u32 mask; int ret; struct idr *idr = &group->inotify_data.idr; @@ -642,6 +670,10 @@ static int inotify_new_watch(struct fsno if (atomic_read(&group->inotify_data.user->inotify_watches) >= inotify_max_user_watches) goto out_err; + ret = inotify_encode_wd_fhandle(tmp_i_mark, dentry); + if (ret) + goto out_err; + ret = inotify_add_to_idr(idr, idr_lock, &group->inotify_data.last_wd, tmp_i_mark); if (ret) @@ -668,16 +700,16 @@ out_err: return ret; } -static int inotify_update_watch(struct fsnotify_group *group, struct inode *inode, u32 arg) +static int inotify_update_watch(struct fsnotify_group *group, struct dentry *dentry, u32 arg) { int ret = 0; retry: /* try to update and existing watch with the new arg */ - ret = inotify_update_existing_watch(group, inode, arg); + ret = inotify_update_existing_watch(group, dentry->d_inode, arg); /* no mark present, try to add a new one */ if (ret == -ENOENT) - ret = inotify_new_watch(group, inode, arg); + ret = inotify_new_watch(group, dentry, arg); /* * inotify_new_watch could race with another thread which did an * inotify_new_watch between the update_existing and the add watch @@ -779,7 +811,7 @@ SYSCALL_DEFINE3(inotify_add_watch, int, group = f.file->private_data; /* create/update an inode mark */ - ret = inotify_update_watch(group, inode, mask); + ret = inotify_update_watch(group, path.dentry, mask); path_put(&path); fput_and_out: fdput(f); _ Patches currently in -mm which might be from gorcunov@xxxxxxxxxx are linux-next.patch proc-check-vma-vm_file-before-dereferencing.patch procfs-add-vmflags-field-in-smaps-output-v4.patch procfs-add-vmflags-field-in-smaps-output-v4-fix.patch proc-pid-status-add-seccomp-field.patch fs-notify-add-procfs-fdinfo-helper.patch fs-eventfd-add-procfs-fdinfo-helper.patch fs-epoll-add-procfs-fdinfo-helper.patch fdinfo-show-sigmask-for-signalfd-fd.patch tools-testing-selftests-kcmp-kcmp_testc-print-reason-for-failure-in-kcmp_test.patch -- 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