1 files changed, 17 insertions, 2 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2995a271ec46..511fbaabf624 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1872,7 +1872,7 @@ struct super_operations {
  */
 #define __IS_FLG(inode, flg)    ((inode)->i_sb->s_flags & (flg))
 
-static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags & MS_RDONLY; }
+static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags & SB_RDONLY; }
 #define IS_RDONLY(inode)        sb_rdonly((inode)->i_sb)
 #define IS_SYNC(inode)          (__IS_FLG(inode, SB_SYNCHRONOUS) || \
                                         ((inode)->i_flags & S_SYNC))
@@ -3088,7 +3088,8 @@ static inline int vfs_lstat(const char __user *name, struct kstat *stat)
 static inline int vfs_fstatat(int dfd, const char __user *filename,
                               struct kstat *stat, int flags)
 {
-        return vfs_statx(dfd, filename, flags, stat, STATX_BASIC_STATS);
+        return vfs_statx(dfd, filename, flags | AT_NO_AUTOMOUNT,
+                         stat, STATX_BASIC_STATS);
 }
 static inline int vfs_fstat(int fd, struct kstat *stat)
 {
@@ -3194,6 +3195,20 @@ static inline bool vma_is_dax(struct vm_area_struct *vma)
         return vma->vm_file && IS_DAX(vma->vm_file->f_mapping->host);
 }
 
+static inline bool vma_is_fsdax(struct vm_area_struct *vma)
+{
+        struct inode *inode;
+
+        if (!vma->vm_file)
+                return false;
+        if (!vma_is_dax(vma))
+                return false;
+        inode = file_inode(vma->vm_file);
+        if (inode->i_mode == S_IFCHR)
+                return false; /* device-dax */
+        return true;
+}
+
 static inline int iocb_flags(struct file *file)
 {
         int res = 0;