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

Commit efd3d77b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: vfs: fix export symbol types 



In commit 4fd07efd90ca ("ANDROID: vfs: Add permission2 for filesystems
with per mount permissions") some new symbols were exported, but they
should have been set as _GPL symbols.

Fix this up by properly.

Bug: 35848445
Cc: Daniel Rosenberg <drosen@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I4fb4b81f3b0a9d0b4c3aa69fffbc723762a629aa
parent b7f90ce5

fs/namei.c

+11 −11
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ int inode_permission2(struct vfsmount *mnt, struct inode *inode, int mask) 
	retval = security_inode_permission(inode, mask);

	return retval;

}

EXPORT_SYMBOL(inode_permission2);

EXPORT_SYMBOL_GPL(inode_permission2);



int inode_permission(struct inode *inode, int mask)

{
@@ -2637,7 +2637,7 @@ struct dentry *lookup_one_len2(const char *name, struct vfsmount *mnt, struct de 
	dentry = lookup_dcache(&this, base, 0);

	return dentry ? dentry : __lookup_slow(&this, base, 0);

}

EXPORT_SYMBOL(lookup_one_len2);

EXPORT_SYMBOL_GPL(lookup_one_len2);



struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)

{
@@ -3015,7 +3015,7 @@ int vfs_create2(struct vfsmount *mnt, struct inode *dir, struct dentry *dentry, 
		fsnotify_create(dir, dentry);

	return error;

}

EXPORT_SYMBOL(vfs_create2);

EXPORT_SYMBOL_GPL(vfs_create2);



int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,

		bool want_excl)
@@ -3043,7 +3043,7 @@ int vfs_mkobj2(struct vfsmount *mnt, struct dentry *dentry, umode_t mode, 
		fsnotify_create(dir, dentry);

	return error;

}

EXPORT_SYMBOL(vfs_mkobj2);

EXPORT_SYMBOL_GPL(vfs_mkobj2);





int vfs_mkobj(struct dentry *dentry, umode_t mode,
@@ -3841,7 +3841,7 @@ int vfs_mknod2(struct vfsmount *mnt, struct inode *dir, struct dentry *dentry, u 
		fsnotify_create(dir, dentry);

	return error;

}

EXPORT_SYMBOL(vfs_mknod2);

EXPORT_SYMBOL_GPL(vfs_mknod2);



int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)

{
@@ -3945,7 +3945,7 @@ int vfs_mkdir2(struct vfsmount *mnt, struct inode *dir, struct dentry *dentry, u 
		fsnotify_mkdir(dir, dentry);

	return error;

}

EXPORT_SYMBOL(vfs_mkdir2);

EXPORT_SYMBOL_GPL(vfs_mkdir2);



int vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)

{
@@ -4025,7 +4025,7 @@ int vfs_rmdir2(struct vfsmount *mnt, struct inode *dir, struct dentry *dentry) 
		d_delete(dentry);

	return error;

}

EXPORT_SYMBOL(vfs_rmdir2);

EXPORT_SYMBOL_GPL(vfs_rmdir2);



int vfs_rmdir(struct inode *dir, struct dentry *dentry)

{
@@ -4153,7 +4153,7 @@ int vfs_unlink2(struct vfsmount *mnt, struct inode *dir, struct dentry *dentry, 


	return error;

}

EXPORT_SYMBOL(vfs_unlink2);

EXPORT_SYMBOL_GPL(vfs_unlink2);



int vfs_unlink(struct inode *dir, struct dentry *dentry, struct inode **delegated_inode)

{
@@ -4273,7 +4273,7 @@ int vfs_symlink2(struct vfsmount *mnt, struct inode *dir, struct dentry *dentry, 
		fsnotify_create(dir, dentry);

	return error;

}

EXPORT_SYMBOL(vfs_symlink2);

EXPORT_SYMBOL_GPL(vfs_symlink2);



int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname)

{
@@ -4401,7 +4401,7 @@ int vfs_link2(struct vfsmount *mnt, struct dentry *old_dentry, struct inode *dir 
		fsnotify_link(dir, inode, new_dentry);

	return error;

}

EXPORT_SYMBOL(vfs_link2);

EXPORT_SYMBOL_GPL(vfs_link2);



int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry, struct inode **delegated_inode)

{
@@ -4668,7 +4668,7 @@ int vfs_rename2(struct vfsmount *mnt, 


	return error;

}

EXPORT_SYMBOL(vfs_rename2);

EXPORT_SYMBOL_GPL(vfs_rename2);



int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,

	       struct inode *new_dir, struct dentry *new_dentry,