Commit 82dab104 authored by Eric Paris's avatar Eric Paris Committed by James Morris
Browse files

security: remove dead hook sb_post_remount 



Unused hook.  Remove.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 4b61d12c

fs/namespace.c

+0 −2
Original line number Diff line number Diff line
@@ -1573,8 +1573,6 @@ static int do_remount(struct path *path, int flags, int mnt_flags, 
	}

	up_write(&sb->s_umount);

	if (!err) {

		security_sb_post_remount(path->mnt, flags, data);



		spin_lock(&vfsmount_lock);

		touch_mnt_namespace(path->mnt->mnt_ns);

		spin_unlock(&vfsmount_lock);

include/linux/security.h

+0 −13
Original line number Diff line number Diff line
@@ -272,12 +272,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	@mnt contains the mounted file system.

 *	@flags contains the unmount flags, e.g. MNT_FORCE.

 *	Return 0 if permission is granted.

 * @sb_post_remount:

 *	Update the security module's state when a filesystem is remounted.

 *	This hook is only called if the remount was successful.

 *	@mnt contains the mounted file system.

 *	@flags contains the new filesystem flags.

 *	@data contains the filesystem-specific data.

 * @sb_post_addmount:

 *	Update the security module's state when a filesystem is mounted.

 *	This hook is called any time a mount is successfully grafetd to
@@ -1468,8 +1462,6 @@ struct security_operations { 
	int (*sb_mount) (char *dev_name, struct path *path,

			 char *type, unsigned long flags, void *data);

	int (*sb_umount) (struct vfsmount *mnt, int flags);

	void (*sb_post_remount) (struct vfsmount *mnt,

				 unsigned long flags, void *data);

	void (*sb_post_addmount) (struct vfsmount *mnt,

				  struct path *mountpoint);

	int (*sb_pivotroot) (struct path *old_path,
@@ -1764,7 +1756,6 @@ int security_sb_statfs(struct dentry *dentry); 
int security_sb_mount(char *dev_name, struct path *path,

		      char *type, unsigned long flags, void *data);

int security_sb_umount(struct vfsmount *mnt, int flags);

void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data);

void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint);

int security_sb_pivotroot(struct path *old_path, struct path *new_path);

void security_sb_post_pivotroot(struct path *old_path, struct path *new_path);
@@ -2081,10 +2072,6 @@ static inline int security_sb_umount(struct vfsmount *mnt, int flags) 
	return 0;

}



static inline void security_sb_post_remount(struct vfsmount *mnt,

					     unsigned long flags, void *data)

{ }



static inline void security_sb_post_addmount(struct vfsmount *mnt,

					     struct path *mountpoint)

{ }

security/capability.c

+0 −6
Original line number Diff line number Diff line
@@ -85,11 +85,6 @@ static int cap_sb_umount(struct vfsmount *mnt, int flags) 
	return 0;

}



static void cap_sb_post_remount(struct vfsmount *mnt, unsigned long flags,

				void *data)

{

}



static void cap_sb_post_addmount(struct vfsmount *mnt, struct path *path)

{

}
@@ -929,7 +924,6 @@ void security_fixup_ops(struct security_operations *ops) 
	set_to_cap_if_null(ops, sb_statfs);

	set_to_cap_if_null(ops, sb_mount);

	set_to_cap_if_null(ops, sb_umount);

	set_to_cap_if_null(ops, sb_post_remount);

	set_to_cap_if_null(ops, sb_post_addmount);

	set_to_cap_if_null(ops, sb_pivotroot);

	set_to_cap_if_null(ops, sb_post_pivotroot);

security/security.c

+0 −5
Original line number Diff line number Diff line
@@ -311,11 +311,6 @@ int security_sb_umount(struct vfsmount *mnt, int flags) 
	return security_ops->sb_umount(mnt, flags);

}



void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data)

{

	security_ops->sb_post_remount(mnt, flags, data);

}



void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint)

{

	security_ops->sb_post_addmount(mnt, mountpoint);