UBUNTU: SAUCE: (namespace) ext4: Add support for unprivileged mounts from user namespaces

[mirror_ubuntu-zesty-kernel.git] / fs / ext4 / namei.c

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index eadba919f26b1484c10125739a0e684fe49b7273..71bfb48e94395f265d6ad2835f5e1c6a42739187 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -3236,8 +3236,8 @@ static int ext4_link(struct dentry *old_dentry,
                return -EPERM;
 
        if ((ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT)) &&
-          (!projid_eq(EXT4_I(dir)->i_projid,
-                      EXT4_I(old_dentry->d_inode)->i_projid)))
+          (!projid_valid_eq(EXT4_I(dir)->i_projid,
+                            EXT4_I(old_dentry->d_inode)->i_projid)))
                return -EXDEV;
 
        err = dquot_initialize(dir);
@@ -3521,8 +3521,8 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
        u8 old_file_type;
 
        if ((ext4_test_inode_flag(new_dir, EXT4_INODE_PROJINHERIT)) &&
-           (!projid_eq(EXT4_I(new_dir)->i_projid,
-                       EXT4_I(old_dentry->d_inode)->i_projid)))
+           (!projid_valid_eq(EXT4_I(new_dir)->i_projid,
+                             EXT4_I(old_dentry->d_inode)->i_projid)))
                return -EXDEV;
 
        retval = dquot_initialize(old.dir);
@@ -3733,11 +3733,11 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
                return -EPERM;
 
        if ((ext4_test_inode_flag(new_dir, EXT4_INODE_PROJINHERIT) &&
-            !projid_eq(EXT4_I(new_dir)->i_projid,
-                       EXT4_I(old_dentry->d_inode)->i_projid)) ||
+            !projid_valid_eq(EXT4_I(new_dir)->i_projid,
+                             EXT4_I(old_dentry->d_inode)->i_projid)) ||
            (ext4_test_inode_flag(old_dir, EXT4_INODE_PROJINHERIT) &&
-            !projid_eq(EXT4_I(old_dir)->i_projid,
-                       EXT4_I(new_dentry->d_inode)->i_projid)))
+            !projid_valid_eq(EXT4_I(old_dir)->i_projid,
+                             EXT4_I(new_dentry->d_inode)->i_projid)))
                return -EXDEV;
 
        retval = dquot_initialize(old.dir);