#include <linux/dcache.h>
#include <linux/security.h>
-#include "ntfs.h"
+#include "attrib.h"
+#include "debug.h"
#include "dir.h"
+#include "mft.h"
+#include "ntfs.h"
/**
* ntfs_lookup - find the inode represented by a dentry in a directory inode
dent_inode = ntfs_iget(vol->sb, dent_ino);
if (likely(!IS_ERR(dent_inode))) {
/* Consistency check. */
- if (MSEQNO(mref) == NTFS_I(dent_inode)->seq_no ||
+ if (is_bad_inode(dent_inode) || MSEQNO(mref) ==
+ NTFS_I(dent_inode)->seq_no ||
dent_ino == FILE_MFT) {
/* Perfect WIN32/POSIX match. -- Case 1. */
if (!name) {
- ntfs_debug("Done.");
+ ntfs_debug("Done. (Case 1.)");
return d_splice_alias(dent_inode, dent);
}
/*
- * We are too indented. Handle imperfect
+ * We are too indented. Handle imperfect
* matches and short file names further below.
*/
goto handle_name;
nls_name.name = NULL;
if (name->type != FILE_NAME_DOS) { /* Case 2. */
+ ntfs_debug("Case 2.");
nls_name.len = (unsigned)ntfs_ucstonls(vol,
(ntfschar*)&name->name, name->len,
(unsigned char**)&nls_name.name, 0);
} else /* if (name->type == FILE_NAME_DOS) */ { /* Case 3. */
FILE_NAME_ATTR *fn;
+ ntfs_debug("Case 3.");
kfree(name);
/* Find the WIN32 name corresponding to the matched DOS name. */
dput(real_dent);
else
new_dent = real_dent;
+ ntfs_debug("Done. (Created new dentry.)");
return new_dent;
}
kfree(nls_name.name);
/* Matching dentry exists, check if it is negative. */
if (real_dent->d_inode) {
- BUG_ON(real_dent->d_inode != dent_inode);
+ if (unlikely(real_dent->d_inode != dent_inode)) {
+ /* This can happen because bad inodes are unhashed. */
+ BUG_ON(!is_bad_inode(dent_inode));
+ BUG_ON(!is_bad_inode(real_dent->d_inode));
+ }
/*
* Already have the inode and the dentry attached, decrement
* the reference count to balance the ntfs_iget() we did
* about any NFS/disconnectedness issues here.
*/
iput(dent_inode);
+ ntfs_debug("Done. (Already had inode and dentry.)");
return real_dent;
}
/*
if (!S_ISDIR(dent_inode->i_mode)) {
/* Not a directory; everything is easy. */
d_instantiate(real_dent, dent_inode);
+ ntfs_debug("Done. (Already had negative file dentry.)");
return real_dent;
}
spin_lock(&dcache_lock);
real_dent->d_inode = dent_inode;
spin_unlock(&dcache_lock);
security_d_instantiate(real_dent, dent_inode);
+ ntfs_debug("Done. (Already had negative directory dentry.)");
return real_dent;
}
/*
/* Throw away real_dent. */
dput(real_dent);
/* Use new_dent as the actual dentry. */
+ ntfs_debug("Done. (Already had negative, disconnected directory "
+ "dentry.)");
return new_dent;
eio_err_out:
if (m)
unmap_mft_record(ni);
iput(dent_inode);
+ ntfs_error(vol->sb, "Failed, returning error code %i.", err);
return ERR_PTR(err);
}
}