aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-integrity.c
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-07-22 11:15:13 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-07-22 11:15:13 -0400
commitc7f55a28286aeebf0d03d7a95852aa788b1485f1 (patch)
treeb4a80cfd4193bd255c8949c668abb6aae1e15bcc /block/blk-integrity.c
parent113a670ce2eb3daca9fa9c4f43d064d002db7c9b (diff)
parente9b75c60f91a359cb0e1b2d0a9ed1c81485215e2 (diff)
downloadlinux-yocto-c7f55a28286aeebf0d03d7a95852aa788b1485f1.tar.gz
linux-yocto-c7f55a28286aeebf0d03d7a95852aa788b1485f1.tar.bz2
linux-yocto-c7f55a28286aeebf0d03d7a95852aa788b1485f1.zip
Merge branch 'master-5.2'
Diffstat (limited to 'block/blk-integrity.c')
-rw-r--r--block/blk-integrity.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index d1ab089e0919..825c9c070458 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -1,23 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* blk-integrity.c - Block layer data integrity extensions
*
* Copyright (C) 2007, 2008 Oracle Corporation
* Written by: Martin K. Petersen <martin.petersen@oracle.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
- * USA.
- *
*/
#include <linux/blkdev.h>
@@ -365,6 +351,7 @@ static struct attribute *integrity_attrs[] = {
&integrity_device_entry.attr,
NULL,
};
+ATTRIBUTE_GROUPS(integrity);
static const struct sysfs_ops integrity_ops = {
.show = &integrity_attr_show,
@@ -372,7 +359,7 @@ static const struct sysfs_ops integrity_ops = {
};
static struct kobj_type integrity_ktype = {
- .default_attrs = integrity_attrs,
+ .default_groups = integrity_groups,
.sysfs_ops = &integrity_ops,
};