Skip to content

Commit

Permalink
fanotify: rename struct fanotify_{,perm_}event_info
Browse files Browse the repository at this point in the history 
struct fanotify_event_info "inherits" from struct fsnotify_event and
therefore a more appropriate (and short) name for it is fanotify_event.
Same for struct fanotify_perm_event_info, which now "inherits" from
struct fanotify_event.

We plan to reuse the name struct fanotify_event_info for user visible
event info record format.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
  • Loading branch information
Amir Goldstein authored and Jan Kara committed Feb 6, 2019
1 parent a0a92d2 commit 3391399
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
16 changes: 8 additions & 8 deletions fs/notify/fanotify/fanotify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
static bool should_merge(struct fsnotify_event *old_fsn,
struct fsnotify_event *new_fsn)
{
struct fanotify_event_info *old, *new;
struct fanotify_event *old, *new;

pr_debug("%s: old=%p new=%p\n", __func__, old_fsn, new_fsn);
old = FANOTIFY_E(old_fsn);
Expand All @@ -36,7 +36,7 @@ static bool should_merge(struct fsnotify_event *old_fsn,
static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)
{
struct fsnotify_event *test_event;
struct fanotify_event_info *new;
struct fanotify_event *new;

pr_debug("%s: list=%p event=%p\n", __func__, list, event);
new = FANOTIFY_E(event);
Expand All @@ -60,7 +60,7 @@ static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)
}

static int fanotify_get_response(struct fsnotify_group *group,
struct fanotify_perm_event_info *event,
struct fanotify_perm_event *event,
struct fsnotify_iter_info *iter_info)
{
int ret;
Expand Down Expand Up @@ -143,11 +143,11 @@ static u32 fanotify_group_event_mask(struct fsnotify_iter_info *iter_info,
~marks_ignored_mask;
}

struct fanotify_event_info *fanotify_alloc_event(struct fsnotify_group *group,
struct fanotify_event *fanotify_alloc_event(struct fsnotify_group *group,
struct inode *inode, u32 mask,
const struct path *path)
{
struct fanotify_event_info *event = NULL;
struct fanotify_event *event = NULL;
gfp_t gfp = GFP_KERNEL_ACCOUNT;

/*
Expand All @@ -162,7 +162,7 @@ struct fanotify_event_info *fanotify_alloc_event(struct fsnotify_group *group,
memalloc_use_memcg(group->memcg);

if (fanotify_is_perm_event(mask)) {
struct fanotify_perm_event_info *pevent;
struct fanotify_perm_event *pevent;

pevent = kmem_cache_alloc(fanotify_perm_event_cachep, gfp);
if (!pevent)
Expand Down Expand Up @@ -200,7 +200,7 @@ static int fanotify_handle_event(struct fsnotify_group *group,
struct fsnotify_iter_info *iter_info)
{
int ret = 0;
struct fanotify_event_info *event;
struct fanotify_event *event;
struct fsnotify_event *fsn_event;

BUILD_BUG_ON(FAN_ACCESS != FS_ACCESS);
Expand Down Expand Up @@ -278,7 +278,7 @@ static void fanotify_free_group_priv(struct fsnotify_group *group)

static void fanotify_free_event(struct fsnotify_event *fsn_event)
{
struct fanotify_event_info *event;
struct fanotify_event *event;

event = FANOTIFY_E(fsn_event);
path_put(&event->path);
Expand Down
16 changes: 8 additions & 8 deletions fs/notify/fanotify/fanotify.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern struct kmem_cache *fanotify_perm_event_cachep;
* fanotify_handle_event() and freed when the information is retrieved by
* userspace
*/
struct fanotify_event_info {
struct fanotify_event {
struct fsnotify_event fse;
u32 mask;
/*
Expand All @@ -30,16 +30,16 @@ struct fanotify_event_info {
* group->notification_list to group->fanotify_data.access_list to wait for
* user response.
*/
struct fanotify_perm_event_info {
struct fanotify_event_info fae;
struct fanotify_perm_event {
struct fanotify_event fae;
int response; /* userspace answer to question */
int fd; /* fd we passed to userspace for this event */
};

static inline struct fanotify_perm_event_info *
static inline struct fanotify_perm_event *
FANOTIFY_PE(struct fsnotify_event *fse)
{
return container_of(fse, struct fanotify_perm_event_info, fae.fse);
return container_of(fse, struct fanotify_perm_event, fae.fse);
}

static inline bool fanotify_is_perm_event(u32 mask)
Expand All @@ -48,11 +48,11 @@ static inline bool fanotify_is_perm_event(u32 mask)
mask & FANOTIFY_PERM_EVENTS;
}

static inline struct fanotify_event_info *FANOTIFY_E(struct fsnotify_event *fse)
static inline struct fanotify_event *FANOTIFY_E(struct fsnotify_event *fse)
{
return container_of(fse, struct fanotify_event_info, fse);
return container_of(fse, struct fanotify_event, fse);
}

struct fanotify_event_info *fanotify_alloc_event(struct fsnotify_group *group,
struct fanotify_event *fanotify_alloc_event(struct fsnotify_group *group,
struct inode *inode, u32 mask,
const struct path *path);
20 changes: 10 additions & 10 deletions fs/notify/fanotify/fanotify_user.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group,
}

static int create_fd(struct fsnotify_group *group,
struct fanotify_event_info *event,
struct fanotify_event *event,
struct file **file)
{
int client_fd;
Expand Down Expand Up @@ -120,13 +120,13 @@ static int fill_event_metadata(struct fsnotify_group *group,
struct file **file)
{
int ret = 0;
struct fanotify_event_info *event;
struct fanotify_event *event;

pr_debug("%s: group=%p metadata=%p event=%p\n", __func__,
group, metadata, fsn_event);

*file = NULL;
event = container_of(fsn_event, struct fanotify_event_info, fse);
event = container_of(fsn_event, struct fanotify_event, fse);
metadata->event_len = FAN_EVENT_METADATA_LEN;
metadata->metadata_len = FAN_EVENT_METADATA_LEN;
metadata->vers = FANOTIFY_METADATA_VERSION;
Expand All @@ -144,10 +144,10 @@ static int fill_event_metadata(struct fsnotify_group *group,
return ret;
}

static struct fanotify_perm_event_info *dequeue_event(
static struct fanotify_perm_event *dequeue_event(
struct fsnotify_group *group, int fd)
{
struct fanotify_perm_event_info *event, *return_e = NULL;
struct fanotify_perm_event *event, *return_e = NULL;

spin_lock(&group->notification_lock);
list_for_each_entry(event, &group->fanotify_data.access_list,
Expand All @@ -169,7 +169,7 @@ static struct fanotify_perm_event_info *dequeue_event(
static int process_access_response(struct fsnotify_group *group,
struct fanotify_response *response_struct)
{
struct fanotify_perm_event_info *event;
struct fanotify_perm_event *event;
int fd = response_struct->fd;
int response = response_struct->response;

Expand Down Expand Up @@ -370,7 +370,7 @@ static ssize_t fanotify_write(struct file *file, const char __user *buf, size_t
static int fanotify_release(struct inode *ignored, struct file *file)
{
struct fsnotify_group *group = file->private_data;
struct fanotify_perm_event_info *event, *next;
struct fanotify_perm_event *event, *next;
struct fsnotify_event *fsn_event;

/*
Expand Down Expand Up @@ -688,7 +688,7 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
struct fsnotify_group *group;
int f_flags, fd;
struct user_struct *user;
struct fanotify_event_info *oevent;
struct fanotify_event *oevent;

pr_debug("%s: flags=%x event_f_flags=%x\n",
__func__, flags, event_f_flags);
Expand Down Expand Up @@ -955,10 +955,10 @@ static int __init fanotify_user_setup(void)

fanotify_mark_cache = KMEM_CACHE(fsnotify_mark,
SLAB_PANIC|SLAB_ACCOUNT);
fanotify_event_cachep = KMEM_CACHE(fanotify_event_info, SLAB_PANIC);
fanotify_event_cachep = KMEM_CACHE(fanotify_event, SLAB_PANIC);
if (IS_ENABLED(CONFIG_FANOTIFY_ACCESS_PERMISSIONS)) {
fanotify_perm_event_cachep =
KMEM_CACHE(fanotify_perm_event_info, SLAB_PANIC);
KMEM_CACHE(fanotify_perm_event, SLAB_PANIC);
}

return 0;
Expand Down

0 comments on commit 3391399

Please sign in to comment.