The patch titled configfs+dlm: Separate out __CONFIGFS_ATTR into configfs.h has been added to the -mm tree. Its filename is configfsdlm-separate-out-__configfs_attr-into-configfsh.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: configfs+dlm: Separate out __CONFIGFS_ATTR into configfs.h From: Satyam Sharma <ssatyam@xxxxxxxxxxxxxx> fs/dlm/config.c contains a useful generic macro called __CONFIGFS_ATTR that is similar to sysfs' __ATTR macro that makes defining attributes easy for any user of configfs. Separate it out into configfs.h so that other users (forthcoming in dynamic netconsole patchset) can use it too. Signed-off-by: Satyam Sharma <ssatyam@xxxxxxxxxxxxxx> Cc: Joel Becker <joel.becker@xxxxxxxxxx> Cc: David Teigland <teigland@xxxxxxxxxx> Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/dlm/config.c | 8 -------- include/linux/configfs.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff -puN fs/dlm/config.c~configfsdlm-separate-out-__configfs_attr-into-configfsh fs/dlm/config.c --- a/fs/dlm/config.c~configfsdlm-separate-out-__configfs_attr-into-configfsh +++ a/fs/dlm/config.c @@ -133,14 +133,6 @@ static ssize_t cluster_set(struct cluste return len; } -#define __CONFIGFS_ATTR(_name,_mode,_read,_write) { \ - .attr = { .ca_name = __stringify(_name), \ - .ca_mode = _mode, \ - .ca_owner = THIS_MODULE }, \ - .show = _read, \ - .store = _write, \ -} - #define CLUSTER_ATTR(name, check_zero) \ static ssize_t name##_write(struct cluster *cl, const char *buf, size_t len) \ { \ diff -puN include/linux/configfs.h~configfsdlm-separate-out-__configfs_attr-into-configfsh include/linux/configfs.h --- a/include/linux/configfs.h~configfsdlm-separate-out-__configfs_attr-into-configfsh +++ a/include/linux/configfs.h @@ -130,6 +130,22 @@ struct configfs_attribute { mode_t ca_mode; }; +/* + * Users often need to create attribute structures for their configurable + * attributes, containing a configfs_attribute member and function pointers + * for the show() and store() operations on that attribute. They can use + * this macro (similar to sysfs' __ATTR) to make defining attributes easier. + */ +#define __CONFIGFS_ATTR(_name, _mode, _show, _store) \ +{ \ + .attr = { \ + .ca_name = __stringify(_name), \ + .ca_mode = _mode, \ + .ca_owner = THIS_MODULE, \ + }, \ + .show = _show, \ + .store = _store, \ +} /* * If allow_link() exists, the item can symlink(2) out to other _ Patches currently in -mm which might be from ssatyam@xxxxxxxxxxxxxx are git-gfs2-nmw.patch git-ocfs2.patch drivers-message-i2o-devicec-remove-redundant-gfp_atomic-from-kmalloc.patch drivers-scsi-aic7xxx_oldc-remove-redundant-gfp_atomic-from-kmalloc.patch netpoll-fix-a-leak-n-bug-in-netpoll_cleanup.patch introduce-write_trylock_irqsave.patch configfsdlm-separate-out-__configfs_attr-into-configfsh.patch configfsdlmocfs2-convert-subsystem-semaphore-to-mutex.patch configfsdlm-rename-config_group_find_obj-and-state-semantics-clearly.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html