Djam/kernel-5.10
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-5.10.git synced 2025-02-25 09:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-diffed fs-aufs4.patch for 4.14.3: context change only

Browse source
This commit is contained in:
Evgenii Shatokhin 2017-11-30 14:13:07 +03:00
parent d9d299dcf8
commit ffad7b40b0
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs-aufs4.patch
View file

@ -37178,18 +37178,18 @@ index 32357534de18..14a2d48f3ce2 100644
int fsnotify_fasync(int fd, struct file *file, int on) int fsnotify_fasync(int fd, struct file *file, int on)
{ {
diff --git a/fs/notify/mark.c b/fs/notify/mark.c diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 9991f8826734..117042cf2767 100644 index 258d99087183..9a80ee8bdc8b 100644
--- a/fs/notify/mark.c --- a/fs/notify/mark.c
+++ b/fs/notify/mark.c +++ b/fs/notify/mark.c
@@ -118,6 +118,7 @@ static bool fsnotify_get_mark_safe(struct fsnotify_mark *mark) @@ -124,6 +124,7 @@ static void __fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)
{ else if (conn->flags & FSNOTIFY_OBJ_TYPE_VFSMOUNT)
return atomic_inc_not_zero(&mark->refcnt); real_mount(conn->mnt)->mnt_fsnotify_mask = new_mask;
} }
+EXPORT_SYMBOL_GPL(fsnotify_put_mark); +EXPORT_SYMBOL_GPL(fsnotify_put_mark);
static void __fsnotify_recalc_mask(struct fsnotify_mark_connector *conn) /*
{ * Calculate mask of events for a list of marks. The caller must make sure
@@ -395,6 +396,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark, @@ -392,6 +393,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
mutex_unlock(&group->mark_mutex); mutex_unlock(&group->mark_mutex);
fsnotify_free_mark(mark); fsnotify_free_mark(mark);
} }
@ -37197,7 +37197,7 @@ index 9991f8826734..117042cf2767 100644
/* /*
* Sorting function for lists of fsnotify marks. * Sorting function for lists of fsnotify marks.
@@ -607,6 +609,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark, struct inode *inode, @@ -604,6 +606,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark, struct inode *inode,
fsnotify_put_mark(mark); fsnotify_put_mark(mark);
return ret; return ret;
} }
@ -37205,7 +37205,7 @@ index 9991f8826734..117042cf2767 100644
int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode, int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
struct vfsmount *mnt, int allow_dups) struct vfsmount *mnt, int allow_dups)
@@ -742,6 +745,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, @@ -739,6 +742,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
fsnotify_get_group(group); fsnotify_get_group(group);
mark->group = group; mark->group = group;
} }