Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd657170 authored by Dan Carpenter's avatar Dan Carpenter Committed by Al Viro
Browse files

fsnotify: remove unused parameter from send_to_group() 



We don't use "mnt" anymore in send_to_group() after 1968f5ee ("fanotify:
use both marks when possible") was applied.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a4f9a9a6

fs/notify/fsnotify.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ int __fsnotify_parent(struct path *path, struct dentry *dentry, __u32 mask) 
}

}

EXPORT_SYMBOL_GPL(__fsnotify_parent);

EXPORT_SYMBOL_GPL(__fsnotify_parent);





static int send_to_group(struct inode *to_tell, struct vfsmount *mnt,

static int send_to_group(struct inode *to_tell,

			 struct fsnotify_mark *inode_mark,

			 struct fsnotify_mark *inode_mark,

			 struct fsnotify_mark *vfsmount_mark,

			 struct fsnotify_mark *vfsmount_mark,

			 __u32 mask, void *data,

			 __u32 mask, void *data,
@@ -168,10 +168,10 @@ static int send_to_group(struct inode *to_tell, struct vfsmount *mnt, 
			vfsmount_test_mask &= ~inode_mark->ignored_mask;

			vfsmount_test_mask &= ~inode_mark->ignored_mask;

	}

	}





	pr_debug("%s: group=%p to_tell=%p mnt=%p mask=%x inode_mark=%p"

	pr_debug("%s: group=%p to_tell=%p mask=%x inode_mark=%p"

		 " inode_test_mask=%x vfsmount_mark=%p vfsmount_test_mask=%x"

		 " inode_test_mask=%x vfsmount_mark=%p vfsmount_test_mask=%x"

		 " data=%p data_is=%d cookie=%d event=%p\n",

		 " data=%p data_is=%d cookie=%d event=%p\n",

		 __func__, group, to_tell, mnt, mask, inode_mark,

		 __func__, group, to_tell, mask, inode_mark,

		 inode_test_mask, vfsmount_mark, vfsmount_test_mask, data,

		 inode_test_mask, vfsmount_mark, vfsmount_test_mask, data,

		 data_is, cookie, *event);

		 data_is, cookie, *event);
@@ -258,16 +258,16 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, 




		if (inode_group > vfsmount_group) {

		if (inode_group > vfsmount_group) {

			/* handle inode */

			/* handle inode */

			ret = send_to_group(to_tell, NULL, inode_mark, NULL, mask, data,

			ret = send_to_group(to_tell, inode_mark, NULL, mask, data,

					    data_is, cookie, file_name, &event);

					    data_is, cookie, file_name, &event);

			/* we didn't use the vfsmount_mark */

			/* we didn't use the vfsmount_mark */

			vfsmount_group = NULL;

			vfsmount_group = NULL;

		} else if (vfsmount_group > inode_group) {

		} else if (vfsmount_group > inode_group) {

			ret = send_to_group(to_tell, &mnt->mnt, NULL, vfsmount_mark, mask, data,

			ret = send_to_group(to_tell, NULL, vfsmount_mark, mask, data,

					    data_is, cookie, file_name, &event);

					    data_is, cookie, file_name, &event);

			inode_group = NULL;

			inode_group = NULL;

		} else {

		} else {

			ret = send_to_group(to_tell, &mnt->mnt, inode_mark, vfsmount_mark,

			ret = send_to_group(to_tell, inode_mark, vfsmount_mark,

					    mask, data, data_is, cookie, file_name,

					    mask, data, data_is, cookie, file_name,

					    &event);

					    &event);

		}

		}