diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-02 17:46:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-02 17:46:56 -0400 |
commit | 264800b5ecc7be49b2c6027738091ff3385e0cae (patch) | |
tree | fbbb39f9b564eedb42919034174453894fec8a99 | |
parent | 05cf8077e54b20dddb756eaa26f3aeb5c38dd3cf (diff) | |
parent | 96c22a3293512ba684e73a981196430f524689da (diff) |
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/configfs.h b/include/linux/configfs.h index 485fe5519448..d9d6a9d77489 100644 --- a/include/linux/configfs.h +++ b/include/linux/configfs.h | |||
@@ -188,7 +188,7 @@ static struct configfs_bin_attribute _pfx##attr_##_name = { \ | |||
188 | } | 188 | } |
189 | 189 | ||
190 | #define CONFIGFS_BIN_ATTR_RO(_pfx, _name, _priv, _maxsz) \ | 190 | #define CONFIGFS_BIN_ATTR_RO(_pfx, _name, _priv, _maxsz) \ |
191 | static struct configfs_attribute _pfx##attr_##_name = { \ | 191 | static struct configfs_bin_attribute _pfx##attr_##_name = { \ |
192 | .cb_attr = { \ | 192 | .cb_attr = { \ |
193 | .ca_name = __stringify(_name), \ | 193 | .ca_name = __stringify(_name), \ |
194 | .ca_mode = S_IRUGO, \ | 194 | .ca_mode = S_IRUGO, \ |
@@ -200,7 +200,7 @@ static struct configfs_attribute _pfx##attr_##_name = { \ | |||
200 | } | 200 | } |
201 | 201 | ||
202 | #define CONFIGFS_BIN_ATTR_WO(_pfx, _name, _priv, _maxsz) \ | 202 | #define CONFIGFS_BIN_ATTR_WO(_pfx, _name, _priv, _maxsz) \ |
203 | static struct configfs_attribute _pfx##attr_##_name = { \ | 203 | static struct configfs_bin_attribute _pfx##attr_##_name = { \ |
204 | .cb_attr = { \ | 204 | .cb_attr = { \ |
205 | .ca_name = __stringify(_name), \ | 205 | .ca_name = __stringify(_name), \ |
206 | .ca_mode = S_IWUSR, \ | 206 | .ca_mode = S_IWUSR, \ |