Commit f3640192 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Eric Paris
Browse files

fanotify: split fanotify_remove_mark



split fanotify_remove_mark into fanotify_remove_inode_mark and
fanotify_remove_vfsmount_mark.
Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent eac8e9e8
...@@ -310,22 +310,33 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark, __u3 ...@@ -310,22 +310,33 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark, __u3
return mask & oldmask; return mask & oldmask;
} }
static int fanotify_remove_mark(struct fsnotify_group *group, struct inode *inode, static int fanotify_remove_vfsmount_mark(struct fsnotify_group *group,
struct vfsmount *mnt, __u32 mask) struct vfsmount *mnt, __u32 mask)
{ {
struct fsnotify_mark *fsn_mark = NULL; struct fsnotify_mark *fsn_mark = NULL;
__u32 removed; __u32 removed;
BUG_ON(inode && mnt); fsn_mark = fsnotify_find_vfsmount_mark(group, mnt);
BUG_ON(!inode && !mnt); if (!fsn_mark)
return -ENOENT;
if (inode) removed = fanotify_mark_remove_from_mask(fsn_mark, mask);
fsn_mark = fsnotify_find_inode_mark(group, inode); fsnotify_put_mark(fsn_mark);
else if (mnt) if (removed & group->mask)
fsn_mark = fsnotify_find_vfsmount_mark(group, mnt); fsnotify_recalc_group_mask(group);
else if (removed & mnt->mnt_fsnotify_mask)
BUG(); fsnotify_recalc_vfsmount_mask(mnt);
return 0;
}
static int fanotify_remove_inode_mark(struct fsnotify_group *group,
struct inode *inode, __u32 mask)
{
struct fsnotify_mark *fsn_mark = NULL;
__u32 removed;
fsn_mark = fsnotify_find_inode_mark(group, inode);
if (!fsn_mark) if (!fsn_mark)
return -ENOENT; return -ENOENT;
...@@ -335,13 +346,8 @@ static int fanotify_remove_mark(struct fsnotify_group *group, struct inode *inod ...@@ -335,13 +346,8 @@ static int fanotify_remove_mark(struct fsnotify_group *group, struct inode *inod
if (removed & group->mask) if (removed & group->mask)
fsnotify_recalc_group_mask(group); fsnotify_recalc_group_mask(group);
if (inode) { if (removed & inode->i_fsnotify_mask)
if (removed & inode->i_fsnotify_mask) fsnotify_recalc_inode_mask(inode);
fsnotify_recalc_inode_mask(inode);
} else if (mnt) {
if (removed & mnt->mnt_fsnotify_mask)
fsnotify_recalc_vfsmount_mask(mnt);
}
return 0; return 0;
} }
...@@ -531,7 +537,10 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags, ...@@ -531,7 +537,10 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
ret = fanotify_add_inode_mark(group, inode, mask); ret = fanotify_add_inode_mark(group, inode, mask);
break; break;
case FAN_MARK_REMOVE: case FAN_MARK_REMOVE:
ret = fanotify_remove_mark(group, inode, mnt, mask); if (flags & FAN_MARK_MOUNT)
ret = fanotify_remove_vfsmount_mark(group, mnt, mask);
else
ret = fanotify_remove_inode_mark(group, inode, mask);
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment