Commit 51db776a authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

vfs: remove unused ioctl helpers 



Remove vfs_ioc_setflags_prepare(), vfs_ioc_fssetxattr_check() and
simple_fill_fsxattr(), which are no longer used.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 8871d84c

fs/inode.c

+0 −87
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/security.h>

#include <linux/cdev.h>

#include <linux/memblock.h>

#include <linux/fscrypt.h>

#include <linux/fsnotify.h>

#include <linux/mount.h>

#include <linux/posix_acl.h>
@@ -2314,89 +2313,3 @@ struct timespec64 current_time(struct inode *inode) 
	return timestamp_truncate(now, inode);

}

EXPORT_SYMBOL(current_time);
 


/*

 * Generic function to check FS_IOC_SETFLAGS values and reject any invalid

 * configurations.

 *

 * Note: the caller should be holding i_mutex, or else be sure that they have

 * exclusive access to the inode structure.

 */

int vfs_ioc_setflags_prepare(struct inode *inode, unsigned int oldflags,

			     unsigned int flags)

{

	/*

	 * The IMMUTABLE and APPEND_ONLY flags can only be changed by

	 * the relevant capability.

	 *

	 * This test looks nicer. Thanks to Pauline Middelink

	 */

	if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL) &&

	    !capable(CAP_LINUX_IMMUTABLE))

		return -EPERM;



	return fscrypt_prepare_setflags(inode, oldflags, flags);

}

EXPORT_SYMBOL(vfs_ioc_setflags_prepare);



/*

 * Generic function to check FS_IOC_FSSETXATTR values and reject any invalid

 * configurations.

 *

 * Note: the caller should be holding i_mutex, or else be sure that they have

 * exclusive access to the inode structure.

 */

int vfs_ioc_fssetxattr_check(struct inode *inode, const struct fsxattr *old_fa,

			     struct fsxattr *fa)

{

	/*

	 * Can't modify an immutable/append-only file unless we have

	 * appropriate permission.

	 */

	if ((old_fa->fsx_xflags ^ fa->fsx_xflags) &

			(FS_XFLAG_IMMUTABLE | FS_XFLAG_APPEND) &&

	    !capable(CAP_LINUX_IMMUTABLE))

		return -EPERM;



	/*

	 * Project Quota ID state is only allowed to change from within the init

	 * namespace. Enforce that restriction only if we are trying to change

	 * the quota ID state. Everything else is allowed in user namespaces.

	 */

	if (current_user_ns() != &init_user_ns) {

		if (old_fa->fsx_projid != fa->fsx_projid)

			return -EINVAL;

		if ((old_fa->fsx_xflags ^ fa->fsx_xflags) &

				FS_XFLAG_PROJINHERIT)

			return -EINVAL;

	}



	/* Check extent size hints. */

	if ((fa->fsx_xflags & FS_XFLAG_EXTSIZE) && !S_ISREG(inode->i_mode))

		return -EINVAL;



	if ((fa->fsx_xflags & FS_XFLAG_EXTSZINHERIT) &&

			!S_ISDIR(inode->i_mode))

		return -EINVAL;



	if ((fa->fsx_xflags & FS_XFLAG_COWEXTSIZE) &&

	    !S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))

		return -EINVAL;



	/*

	 * It is only valid to set the DAX flag on regular files and

	 * directories on filesystems.

	 */

	if ((fa->fsx_xflags & FS_XFLAG_DAX) &&

	    !(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)))

		return -EINVAL;



	/* Extent size hints of zero turn off the flags. */

	if (fa->fsx_extsize == 0)

		fa->fsx_xflags &= ~(FS_XFLAG_EXTSIZE | FS_XFLAG_EXTSZINHERIT);

	if (fa->fsx_cowextsize == 0)

		fa->fsx_xflags &= ~FS_XFLAG_COWEXTSIZE;



	return 0;

}

EXPORT_SYMBOL(vfs_ioc_fssetxattr_check);

include/linux/fs.h

+0 −12
Original line number Diff line number Diff line
@@ -3571,18 +3571,6 @@ extern int vfs_fadvise(struct file *file, loff_t offset, loff_t len, 
extern int generic_fadvise(struct file *file, loff_t offset, loff_t len,

			   int advice);



int vfs_ioc_setflags_prepare(struct inode *inode, unsigned int oldflags,

			     unsigned int flags);



int vfs_ioc_fssetxattr_check(struct inode *inode, const struct fsxattr *old_fa,

			     struct fsxattr *fa);



static inline void simple_fill_fsxattr(struct fsxattr *fa, __u32 xflags)

{

	memset(fa, 0, sizeof(*fa));

	fa->fsx_xflags = xflags;

}



/*

 * Flush file data before changing attributes.  Caller must hold any locks

 * required to prevent further writes to this file until we're done setting