summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-02 16:46:56 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-02 16:46:56 -0500
commit264800b5ecc7be49b2c6027738091ff3385e0cae (patch)
treefbbb39f9b564eedb42919034174453894fec8a99
parent05cf8077e54b20dddb756eaa26f3aeb5c38dd3cf (diff)
parent96c22a3293512ba684e73a981196430f524689da (diff)
downloadop-kernel-dev-264800b5ecc7be49b2c6027738091ff3385e0cae.zip
op-kernel-dev-264800b5ecc7be49b2c6027738091ff3385e0cae.tar.gz
Merge tag 'configfs-for-linus-2' of git://git.infradead.org/users/hch/configfs
Pull configfs fix from Christoph Hellwig: "A trivial fix to the recently introduced binary attribute helper macros" * tag 'configfs-for-linus-2' of git://git.infradead.org/users/hch/configfs: configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions
-rw-r--r--include/linux/configfs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index 485fe55..d9d6a9d 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -188,7 +188,7 @@ static struct configfs_bin_attribute _pfx##attr_##_name = { \
}
#define CONFIGFS_BIN_ATTR_RO(_pfx, _name, _priv, _maxsz) \
-static struct configfs_attribute _pfx##attr_##_name = { \
+static struct configfs_bin_attribute _pfx##attr_##_name = { \
.cb_attr = { \
.ca_name = __stringify(_name), \
.ca_mode = S_IRUGO, \
@@ -200,7 +200,7 @@ static struct configfs_attribute _pfx##attr_##_name = { \
}
#define CONFIGFS_BIN_ATTR_WO(_pfx, _name, _priv, _maxsz) \
-static struct configfs_attribute _pfx##attr_##_name = { \
+static struct configfs_bin_attribute _pfx##attr_##_name = { \
.cb_attr = { \
.ca_name = __stringify(_name), \
.ca_mode = S_IWUSR, \
OpenPOWER on IntegriCloud