UBUNTU: SAUCE: (no-up) include/linux/security.h -- fix syntax error with CONFIG_SECUR...

commit c2ac27f7a443 ("securityfs: update interface to allow
inode_ops, and setup from vfs") introduced a syntax error
in include/linux/security.h when CONFIG_SECURITYFS is not set.
This is exercised by the zfcpdump-kernel for s390x.

BugLink: http://bugs.launchpad.net/bugs/1630990
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/include/linux/security.h b/include/linux/security.h
index f257e7269d20dafb5dff98d55dccc78b257a67dc..7864d10eb29a4e96a6a5b7d01d76225099ca56a0 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1658,7 +1658,7 @@ static inline int __securityfs_setup_d_inode(struct inode *dir,
                                        struct dentry *dentry,
                                        umode_t mode, void *data,
                                        const struct file_operations *fops,
-                                       const struct inode_operations *iops))
+                                       const struct inode_operations *iops)
 {
        return -ENODEV;
 }