1 files changed, 6 insertions, 4 deletions

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 0d2c41666cd2..1652b2c665bb 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1127,13 +1127,15 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
         }
 
         inode->i_uid = le32_to_cpu(fe->uid);
-        if (inode->i_uid == -1 || UDF_QUERY_FLAG(inode->i_sb,
-                                                 UDF_FLAG_UID_IGNORE))
+        if (inode->i_uid == -1 ||
+            UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_IGNORE) ||
+            UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_SET))
                 inode->i_uid = UDF_SB(inode->i_sb)->s_uid;
 
         inode->i_gid = le32_to_cpu(fe->gid);
-        if (inode->i_gid == -1 || UDF_QUERY_FLAG(inode->i_sb,
-                                                 UDF_FLAG_GID_IGNORE))
+        if (inode->i_gid == -1 ||
+            UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_IGNORE) ||
+            UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_SET))
                 inode->i_gid = UDF_SB(inode->i_sb)->s_gid;
 
         inode->i_nlink = le16_to_cpu(fe->fileLinkCount);