diff mbox

[yakkety/master-next,1/1] UBUNTU: SAUCE: (no-up) include/linux/secuirty.h -- fix syntax error with CONFIG_SECURITYFS=n

Message ID 20161006132212.24861-2-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft Oct. 6, 2016, 1:22 p.m. UTC
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>
---
 include/linux/security.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Colin Ian King Oct. 6, 2016, 1:28 p.m. UTC | #1
On 06/10/16 14:22, Andy Whitcroft wrote:
> 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>
> ---
>  include/linux/security.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/security.h b/include/linux/security.h
> index dfec74d..9306771 100644
> --- a/include/linux/security.h
> +++ b/include/linux/security.h
> @@ -1635,7 +1635,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;
>  }
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
Tim Gardner Oct. 6, 2016, 1:37 p.m. UTC | #2
You've marked this '(no-up)'. Isn't this an upstream bug ?
diff mbox

Patch

diff --git a/include/linux/security.h b/include/linux/security.h
index dfec74d..9306771 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1635,7 +1635,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;
 }