#include <linux/quotaops.h>
#include <linux/highmem.h>
#include <linux/pagemap.h>
+#include <linux/dcache.h>
+#include <linux/buffer_head.h>
#define DEBUG_SUBSYSTEM S_LLITE
if (inode) {
lli = ll_i2info(inode);
if (inode->i_state & I_NEW) {
+ int rc;
+
ll_read_inode2(inode, md);
- unlock_new_inode(inode);
- } else {
- if (!(inode->i_state & (I_FREEING | I_CLEAR)))
+ rc = cl_inode_init(inode, md);
+ if (rc != 0) {
+ md->lsm = NULL;
+ make_bad_inode(inode);
+ unlock_new_inode(inode);
+ iput(inode);
+ inode = ERR_PTR(rc);
+ } else
+ unlock_new_inode(inode);
+ } else if (!(inode->i_state & (I_FREEING | I_CLEAR)))
ll_update_inode(inode, md);
- }
- CDEBUG(D_VFSTRACE, "got inode: %lu/%u(%p) for "DFID"\n",
- inode->i_ino, inode->i_generation, inode,
- PFID(&lli->lli_fid));
+ CDEBUG(D_VFSTRACE, "got inode: %p for "DFID"\n",
+ inode, PFID(&md->body->fid1));
}
-
RETURN(inode);
}
static void ll_drop_negative_dentry(struct inode *dir)
-{
+{
struct dentry *dentry, *tmp_alias, *tmp_subdir;
spin_lock(&ll_lookup_lock);
2.4 and
vfs_getattr_it->ll_getattr()->ll_inode_revalidate_it() in 2.6
Everybody else who needs correct file size would call
- ll_glimpse_size or some equivalent themselves anyway.
+ cl_glimpse_size or some equivalent themselves anyway.
Also see bug 7198. */
ll_dops_init(*de, 1);
might get picked up later when UPDATE lock will appear */
if (ll_have_md_lock(parent, MDS_INODELOCK_UPDATE)) {
spin_lock(&dcache_lock);
- ll_d_add(*de, inode);
+ ll_d_add(*de, NULL);
spin_unlock(&dcache_lock);
} else {
(*de)->d_inode = NULL;
(struct ptlrpc_request *)
it->d.lustre.it_data);
} else {
- struct file *filp;
- nd->intent.open.file->private_data = it;
- filp =lookup_instantiate_filp(nd,dentry,
- NULL);
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
/* 2.6.1[456] have a bug in open_namei() that forgets to check
* nd->intent.open.file for error, so we need to return it as lookup's result
* instead */
+ struct file *filp;
+ nd->intent.open.file->private_data = it;
+ filp =lookup_instantiate_filp(nd,dentry,
+ NULL);
if (IS_ERR(filp)) {
if (de)
dput(de);
de = (struct dentry *) filp;
}
+#else
+ nd->intent.open.file->private_data = it;
+ (void)lookup_instantiate_filp(nd,dentry,
+ NULL);
#endif
}
}
#endif
+/**
+ * check new allocated inode, new inode shld not have any valid alias
+ */
+static void ll_validate_new_inode(struct inode *new)
+{
+ struct list_head *lp;
+ struct dentry * dentry;
+ int need_inval = 0;
+ int in_recheck = 0;
+
+ if (list_empty(&new->i_dentry))
+ return;
+recheck:
+ spin_lock(&dcache_lock);
+ list_for_each(lp, &new->i_dentry) {
+ dentry = list_entry(lp, struct dentry, d_alias);
+ if (!d_unhashed(dentry) && !(dentry->d_flags & DCACHE_LUSTRE_INVALID)){
+ ll_dump_inode(new);
+ if (in_recheck)
+ LBUG();
+ }
+ need_inval = 1;
+ }
+ spin_unlock(&dcache_lock);
+
+ if (need_inval && !in_recheck) {
+ /* kill all old inode's data pages */
+ truncate_inode_pages(new->i_mapping, 0);
+
+ /* invalidate all dirent and recheck inode */
+ ll_unhash_aliases(new);
+ in_recheck = 1;
+ goto recheck;
+ }
+}
+
/* We depend on "mode" being set with the proper file type/umask by now */
static struct inode *ll_create_node(struct inode *dir, const char *name,
int namelen, const void *data, int datalen,
if (rc)
GOTO(out, inode = ERR_PTR(rc));
- LASSERT(list_empty(&inode->i_dentry));
+ ll_validate_new_inode(inode);
/* We asked for a lock on the directory, but were granted a
* lock on the inode. Since we finally have an inode pointer,
RETURN(PTR_ERR(inode));
}
+ /* it might been set during parent dir revalidation */
+ dentry->d_flags &= ~DCACHE_LUSTRE_INVALID;
d_instantiate(dentry, inode);
/* Negative dentry may be unhashed if parent does not have UPDATE lock,
* but some callers, e.g. do_coredump, expect dentry to be hashed after
struct lu_fid *fid)
{
struct dentry *parent, *child;
-
+
parent = list_entry(dir->i_dentry.next, struct dentry, d_alias);
child = d_lookup(parent, name);
if (child) {
struct md_op_data *op_data;
int rc;
ENTRY;
-
+
CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p)\n",
name->len, name->name, dir->i_ino, dir->i_generation, dir);
struct lov_stripe_md *lsm = NULL;
struct obd_trans_info oti = { 0 };
struct obdo *oa;
+ struct obd_capa *oc = NULL;
int rc;
ENTRY;
if (body->valid & OBD_MD_FLCOOKIE) {
oa->o_valid |= OBD_MD_FLCOOKIE;
- oti.oti_logcookies =
+ oti.oti_logcookies =
req_capsule_server_sized_get(&request->rq_pill,
&RMF_LOGCOOKIES,
sizeof(struct llog_cookie) *
}
}
- rc = obd_destroy(ll_i2dtexp(dir), oa, lsm, &oti, ll_i2mdexp(dir));
+ if (body->valid & OBD_MD_FLOSSCAPA) {
+ rc = md_unpack_capa(ll_i2mdexp(dir), request, &RMF_CAPA2, &oc);
+ if (rc)
+ GOTO(out_free_memmd, rc);
+ }
+
+ rc = obd_destroy(ll_i2dtexp(dir), oa, lsm, &oti, ll_i2mdexp(dir), oc);
+ capa_put(oc);
OBDO_FREE(oa);
if (rc)
CERROR("obd destroy objid "LPX64" error %d\n",
git://git.whamcloud.com / fs / lustre-release.git / blobdiff