Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 264800b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 05cf8077 96c22a32

include/linux/configfs.h

+2 −2
Original line number Diff line number Diff line
@@ -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,			\