Merge tag 'for_v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[platform/kernel/linux-rpi.git] / fs / ext2 / ext2.h

diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index ad01ef9..b0a6948 100644 (file)
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -283,8 +283,6 @@ static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
 /*
  * ioctl commands
  */
-#define        EXT2_IOC_GETFLAGS               FS_IOC_GETFLAGS
-#define        EXT2_IOC_SETFLAGS               FS_IOC_SETFLAGS
 #define        EXT2_IOC_GETVERSION             FS_IOC_GETVERSION
 #define        EXT2_IOC_SETVERSION             FS_IOC_SETVERSION
 #define        EXT2_IOC_GETRSVSZ               _IOR('f', 5, long)
@@ -293,8 +291,6 @@ static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
 /*
  * ioctl commands in 32 bit emulation
  */
-#define EXT2_IOC32_GETFLAGS            FS_IOC32_GETFLAGS
-#define EXT2_IOC32_SETFLAGS            FS_IOC32_SETFLAGS
 #define EXT2_IOC32_GETVERSION          FS_IOC32_GETVERSION
 #define EXT2_IOC32_SETVERSION          FS_IOC32_SETVERSION
 
@@ -774,6 +770,9 @@ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
                       u64 start, u64 len);
 
 /* ioctl.c */
+extern int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa);
+extern int ext2_fileattr_set(struct user_namespace *mnt_userns,
+                            struct dentry *dentry, struct fileattr *fa);
 extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
 extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long);