|
@@ -436,10 +436,9 @@ int fsnotify_compare_groups(struct fsnotify_group *a, struct fsnotify_group *b)
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
-static int fsnotify_attach_connector_to_object(
|
|
|
- struct fsnotify_mark_connector __rcu **connp,
|
|
|
- struct inode *inode,
|
|
|
- struct vfsmount *mnt)
|
|
|
+static int fsnotify_attach_connector_to_object(fsnotify_connp_t *connp,
|
|
|
+ struct inode *inode,
|
|
|
+ struct vfsmount *mnt)
|
|
|
{
|
|
|
struct fsnotify_mark_connector *conn;
|
|
|
|
|
@@ -476,7 +475,7 @@ static int fsnotify_attach_connector_to_object(
|
|
|
* they are sure list cannot go away under them.
|
|
|
*/
|
|
|
static struct fsnotify_mark_connector *fsnotify_grab_connector(
|
|
|
- struct fsnotify_mark_connector __rcu **connp)
|
|
|
+ fsnotify_connp_t *connp)
|
|
|
{
|
|
|
struct fsnotify_mark_connector *conn;
|
|
|
int idx;
|
|
@@ -508,7 +507,7 @@ static int fsnotify_add_mark_list(struct fsnotify_mark *mark,
|
|
|
{
|
|
|
struct fsnotify_mark *lmark, *last = NULL;
|
|
|
struct fsnotify_mark_connector *conn;
|
|
|
- struct fsnotify_mark_connector __rcu **connp;
|
|
|
+ fsnotify_connp_t *connp;
|
|
|
int cmp;
|
|
|
int err = 0;
|
|
|
|
|
@@ -629,9 +628,8 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
|
|
|
* Given a list of marks, find the mark associated with given group. If found
|
|
|
* take a reference to that mark and return it, else return NULL.
|
|
|
*/
|
|
|
-struct fsnotify_mark *fsnotify_find_mark(
|
|
|
- struct fsnotify_mark_connector __rcu **connp,
|
|
|
- struct fsnotify_group *group)
|
|
|
+struct fsnotify_mark *fsnotify_find_mark(fsnotify_connp_t *connp,
|
|
|
+ struct fsnotify_group *group)
|
|
|
{
|
|
|
struct fsnotify_mark_connector *conn;
|
|
|
struct fsnotify_mark *mark;
|
|
@@ -697,8 +695,8 @@ clear:
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-/* Destroy all marks attached to inode / vfsmount */
|
|
|
-void fsnotify_destroy_marks(struct fsnotify_mark_connector __rcu **connp)
|
|
|
+/* Destroy all marks attached to an object via connector */
|
|
|
+void fsnotify_destroy_marks(fsnotify_connp_t *connp)
|
|
|
{
|
|
|
struct fsnotify_mark_connector *conn;
|
|
|
struct fsnotify_mark *mark, *old_mark = NULL;
|