Merge tag 'locks-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[platform/kernel/linux-exynos.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 495b5c2..0a51a8b 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1002,7 +1002,6 @@ struct file_lock {
        unsigned char fl_type;
        unsigned int fl_pid;
        int fl_link_cpu;                /* what cpu's list is this on? */
-       struct pid *fl_nspid;
        wait_queue_head_t fl_wait;
        struct file *fl_file;
        loff_t fl_start;