diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 18:45:47 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 18:45:47 +0900 |
| commit | ab2789b72df3cf7a01e30636ea86cbbf44ba2e99 (patch) | |
| tree | 98f5359551b9497c51e8429b1dc489a440e30c3f /include | |
| parent | 20223f0f39ea9d31ece08f04ac79f8c4e8d98246 (diff) | |
| parent | 19e72d3abb63cb16d021a4066ce1a18880509e99 (diff) | |
Merge tag 'configfs-for-4.12' of git://git.infradead.org/users/hch/configfs
Pull configfs updates from Christoph Hellwig:
"A fix from Nic for a race seen in production (including a stable tag).
And while I'm sending you this I'm also sneaking in a trivial new
helper from Bart so that we don't need inter-tree dependencies for the
next merge window"
* tag 'configfs-for-4.12' of git://git.infradead.org/users/hch/configfs:
configfs: Introduce config_item_get_unless_zero()
configfs: Fix race between create_link and configfs_rmdir
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/configfs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/configfs.h b/include/linux/configfs.h index 2319b8c108e8..c96709049683 100644 --- a/include/linux/configfs.h +++ b/include/linux/configfs.h @@ -74,7 +74,8 @@ extern void config_item_init_type_name(struct config_item *item, const char *name, struct config_item_type *type); -extern struct config_item * config_item_get(struct config_item *); +extern struct config_item *config_item_get(struct config_item *); +extern struct config_item *config_item_get_unless_zero(struct config_item *); extern void config_item_put(struct config_item *); struct config_item_type { |