Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git

+2 -3
+2 -3
fs/jfs/namei.c
··· 1390 1390 1391 1391 jfs_info("jfs_lookup: name = %s", name); 1392 1392 1393 + if (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2) 1394 + dentry->d_op = &jfs_ci_dentry_operations; 1393 1395 1394 1396 if ((name[0] == '.') && (len == 1)) 1395 1397 inum = dip->i_ino; ··· 1418 1416 iput(ip); 1419 1417 return ERR_PTR(-EACCES); 1420 1418 } 1421 - 1422 - if (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2) 1423 - dentry->d_op = &jfs_ci_dentry_operations; 1424 1419 1425 1420 dentry = d_splice_alias(ip, dentry); 1426 1421