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

Commit e3e205bc authored by threader's avatar threader Committed by Bernhard Thoben
Browse files

fs: verity: protect behind ifdef CONFIG_FS_VERITY to compile without it this far 

Change-Id: I95d5c47ecadc9cd19e3c2eca641f4abcec30262d
parent 2b83be31

fs/ext4/ext4.h

+2 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
#ifdef __KERNEL__

#include <linux/compat.h>

#endif



#ifdef CONFIG_FS_VERITY

#include <linux/fsverity.h>



#endif

/*

 * The fourth extended filesystem constants/structures

 */

fs/ext4/ioctl.c

+4 −2
Original line number Diff line number Diff line
@@ -633,13 +633,13 @@ resizefs_out: 


		return 0;

	}



#ifdef CONFIG_FS_VERITY

	case FS_IOC_READ_VERITY_METADATA:

		if (!ext4_has_feature_verity(sb))

			return -EOPNOTSUPP;

		return fsverity_ioctl_read_metadata(filp,

						    (const void __user *)arg);



#endif

	default:

		return -ENOTTY;

	}
@@ -703,7 +703,9 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case EXT4_IOC_MOVE_EXT:

	case FITRIM:

	case EXT4_IOC_RESIZE_FS:

#ifdef CONFIG_FS_VERITY

	case FS_IOC_READ_VERITY_METADATA:

#endif

		break;

	default:

		return -ENOIOCTLCMD;