Merge branch 'for-next' of git://git.infradead.org/users/eparis/notify

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / notify / fdinfo.c

diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c
index cb99617..238a593 100644 (file)
--- a/fs/notify/fdinfo.c
+++ b/fs/notify/fdinfo.c
@@ -27,13 +27,13 @@ static int show_fdinfo(struct seq_file *m, struct file *f,
        struct fsnotify_mark *mark;
        int ret = 0;
 
-       spin_lock(&group->mark_lock);
+       mutex_lock(&group->mark_mutex);
        list_for_each_entry(mark, &group->marks_list, g_list) {
                ret = show(m, mark);
                if (ret)
                        break;
        }
-       spin_unlock(&group->mark_lock);
+       mutex_unlock(&group->mark_mutex);
        return ret;
 }
 
@@ -111,29 +111,33 @@ int inotify_show_fdinfo(struct seq_file *m, struct file *f)
 
 static int fanotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark)
 {
+       unsigned int mflags = 0;
        struct inode *inode;
        int ret = 0;
 
        if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE))
                return 0;
 
+       if (mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY)
+               mflags |= FAN_MARK_IGNORED_SURV_MODIFY;
+
        if (mark->flags & FSNOTIFY_MARK_FLAG_INODE) {
                inode = igrab(mark->i.inode);
                if (!inode)
                        goto out;
                ret = seq_printf(m, "fanotify ino:%lx sdev:%x "
-                                "mask:%x ignored_mask:%x ",
+                                "mflags:%x mask:%x ignored_mask:%x ",
                                 inode->i_ino, inode->i_sb->s_dev,
-                                mark->mask, mark->ignored_mask);
+                                mflags, mark->mask, mark->ignored_mask);
                ret |= show_mark_fhandle(m, inode);
                ret |= seq_putc(m, '\n');
                iput(inode);
        } else if (mark->flags & FSNOTIFY_MARK_FLAG_VFSMOUNT) {
                struct mount *mnt = real_mount(mark->m.mnt);
 
-               ret = seq_printf(m, "fanotify mnt_id:%x mask:%x "
-                                "ignored_mask:%x\n",
-                                mnt->mnt_id, mark->mask, mark->ignored_mask);
+               ret = seq_printf(m, "fanotify mnt_id:%x mflags:%x mask:%x "
+                                "ignored_mask:%x\n", mnt->mnt_id, mflags,
+                                mark->mask, mark->ignored_mask);
        }
 out:
        return ret;