diff --git a/[refs] b/[refs]
index a1b405fb9925..87ab962c10e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b51e98365e42c27eb2664f8353bc62ab8c55c85
+refs/heads/master: a29fa9dfa4d5d1b962825c79f19d9b6f3f15843b
diff --git a/trunk/fs/ubifs/super.c b/trunk/fs/ubifs/super.c
index de82c5d04ab9..285038548da9 100644
--- a/trunk/fs/ubifs/super.c
+++ b/trunk/fs/ubifs/super.c
@@ -85,7 +85,7 @@ static int validate_inode(struct ubifs_info *c, const struct inode *inode)
 	if (ui->data_len < 0 || ui->data_len > UBIFS_MAX_INO_DATA)
 		return 4;
 
-	if (ui->xattr && (inode->i_mode & S_IFMT) != S_IFREG)
+	if (ui->xattr && !S_ISREG(inode->i_mode))
 		return 5;
 
 	if (!ubifs_compr_present(ui->compr_type)) {