signal: Implement SIL_FAULT_TRAPNO

[linux-2.6-microblaze.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index a047ab3..9e192be 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -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>
@@ -2148,7 +2147,7 @@ EXPORT_SYMBOL(init_special_inode);
 void inode_init_owner(struct user_namespace *mnt_userns, struct inode *inode,
                      const struct inode *dir, umode_t mode)
 {
-       inode->i_uid = fsuid_into_mnt(mnt_userns);
+       inode_fsuid_set(inode, mnt_userns);
        if (dir && dir->i_mode & S_ISGID) {
                inode->i_gid = dir->i_gid;
 
@@ -2160,7 +2159,7 @@ void inode_init_owner(struct user_namespace *mnt_userns, struct inode *inode,
                         !capable_wrt_inode_uidgid(mnt_userns, dir, CAP_FSETID))
                        mode &= ~S_ISGID;
        } else
-               inode->i_gid = fsgid_into_mnt(mnt_userns);
+               inode_fsgid_set(inode, mnt_userns);
        inode->i_mode = mode;
 }
 EXPORT_SYMBOL(inode_init_owner);
@@ -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);