X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fdcache.c;h=c42e89daf752fdeb7236c90a12a514ec86286017;hb=9573911bfb4a2c3d7e2047c9d5f5440d9c7e7db5;hp=7097833c20b6d13d9fec961662204931bbfccf2e;hpb=55989b17c7391266740d68e3c62418e184364ed7;p=fs%2Flustre-release.git diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c index 7097833..c42e89d 100644 --- a/lustre/llite/dcache.c +++ b/lustre/llite/dcache.c @@ -27,7 +27,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,7 +42,6 @@ #define DEBUG_SUBSYSTEM S_LLITE #include -#include #include #include @@ -70,8 +69,7 @@ static void ll_release(struct dentry *de) ll_intent_release(lld->lld_it); OBD_FREE(lld->lld_it, sizeof(*lld->lld_it)); } - LASSERT(lld->lld_cwd_count == 0); - LASSERT(lld->lld_mnt_count == 0); + de->d_fsdata = NULL; call_rcu(&lld->lld_rcu_head, free_dentry_data); @@ -86,14 +84,25 @@ static void ll_release(struct dentry *de) * INVALID) so d_lookup() matches it, but we have no lock on it (so * lock_match() fails) and we spin around real_lookup(). */ #ifdef HAVE_D_COMPARE_7ARGS -int ll_dcompare(const struct dentry *parent, const struct inode *pinode, - const struct dentry *dentry, const struct inode *inode, - unsigned int len, const char *str, const struct qstr *name) +static int ll_dcompare(const struct dentry *parent, const struct inode *pinode, + const struct dentry *dentry, const struct inode *inode, + unsigned int len, const char *str, + const struct qstr *name) +#elif defined(HAVE_D_COMPARE_5ARGS) +static int ll_dcompare(const struct dentry *parent, const struct dentry *dentry, + unsigned int len, const char *str, + const struct qstr *name) #else -int ll_dcompare(struct dentry *parent, struct qstr *d_name, struct qstr *name) +static int ll_dcompare(struct dentry *parent, struct qstr *d_name, + struct qstr *name) #endif { -#ifdef HAVE_D_COMPARE_7ARGS +#if !defined(HAVE_D_COMPARE_7ARGS) && !defined(HAVE_D_COMPARE_5ARGS) + /* XXX: (ugh !) d_name must be in-dentry structure */ + struct dentry *dentry = container_of(d_name, struct dentry, d_name); + unsigned int len = d_name->len; + const char *str = d_name->name; +#endif ENTRY; if (len != name->len) @@ -101,65 +110,19 @@ int ll_dcompare(struct dentry *parent, struct qstr *d_name, struct qstr *name) if (memcmp(str, name->name, len)) RETURN(1); -#else - struct dentry *dentry; - ENTRY; - - if (d_name->len != name->len) - RETURN(1); - - if (memcmp(d_name->name, name->name, name->len)) - RETURN(1); - - /* XXX: d_name must be in-dentry structure */ - dentry = container_of(d_name, struct dentry, d_name); /* ugh */ -#endif CDEBUG(D_DENTRY, "found name %.*s(%p) flags %#x refc %d\n", name->len, name->name, dentry, dentry->d_flags, - d_refcount(dentry)); + ll_d_count(dentry)); /* mountpoint is always valid */ if (d_mountpoint((struct dentry *)dentry)) RETURN(0); if (d_lustre_invalid(dentry)) - RETURN(1); - - RETURN(0); -} - -static inline int return_if_equal(struct ldlm_lock *lock, void *data) -{ - return (ldlm_is_canceling(lock) && ldlm_is_discard_data(lock)) ? - LDLM_ITER_CONTINUE : LDLM_ITER_STOP; -} - -/* find any ldlm lock of the inode in mdc and lov - * return 0 not find - * 1 find one - * < 0 error */ -static int find_cbdata(struct inode *inode) -{ - struct ll_sb_info *sbi = ll_i2sbi(inode); - struct lov_stripe_md *lsm; - int rc = 0; - ENTRY; - - LASSERT(inode); - rc = md_find_cbdata(sbi->ll_md_exp, ll_inode2fid(inode), - return_if_equal, NULL); - if (rc != 0) - RETURN(rc); - - lsm = ccc_inode_lsm_get(inode); - if (lsm == NULL) - RETURN(rc); - - rc = obd_find_cbdata(sbi->ll_dt_exp, lsm, return_if_equal, NULL); - ccc_inode_lsm_put(inode, lsm); + RETURN(1); - RETURN(rc); + RETURN(0); } /** @@ -181,21 +144,10 @@ static int ll_ddelete(HAVE_D_DELETE_CONST struct dentry *de) list_empty(&de->d_subdirs) ? "" : "subdirs"); #ifdef HAVE_DCACHE_LOCK - LASSERT(d_refcount(de) == 0); + LASSERT(ll_d_count(de) == 0); #else /* kernel >= 2.6.38 last refcount is decreased after this function. */ - LASSERT(d_refcount(de) == 1); -#endif - - /* Disable this piece of code temproarily because this is called - * inside dcache_lock so it's not appropriate to do lots of work - * here. ATTENTION: Before this piece of code enabling, LU-2487 must be - * resolved. */ -#if 0 - /* if not ldlm lock for this inode, set i_nlink to 0 so that - * this inode can be recycled later b=20433 */ - if (de->d_inode && !find_cbdata(de->d_inode)) - clear_nlink(de->d_inode); + LASSERT(ll_d_count(de) == 1); #endif if (d_lustre_invalid((struct dentry *)de)) @@ -210,7 +162,7 @@ int ll_d_init(struct dentry *de) CDEBUG(D_DENTRY, "ldd on dentry %.*s (%p) parent %p inode %p refc %d\n", de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode, - d_refcount(de)); + ll_d_count(de)); if (de->d_fsdata == NULL) { struct ll_dentry_data *lld; @@ -240,26 +192,26 @@ int ll_d_init(struct dentry *de) void ll_intent_drop_lock(struct lookup_intent *it) { - if (it->it_op && it->d.lustre.it_lock_mode) { + if (it->it_op && it->it_lock_mode) { struct lustre_handle handle; - handle.cookie = it->d.lustre.it_lock_handle; + handle.cookie = it->it_lock_handle; - CDEBUG(D_DLMTRACE, "releasing lock with cookie "LPX64 - " from it %p\n", handle.cookie, it); - ldlm_lock_decref(&handle, it->d.lustre.it_lock_mode); + CDEBUG(D_DLMTRACE, "releasing lock with cookie %#llx from it %p\n", + handle.cookie, it); + ldlm_lock_decref(&handle, it->it_lock_mode); - /* bug 494: intent_release may be called multiple times, from - * this thread and we don't want to double-decref this lock */ - it->d.lustre.it_lock_mode = 0; - if (it->d.lustre.it_remote_lock_mode != 0) { - handle.cookie = it->d.lustre.it_remote_lock_handle; + /* bug 494: intent_release may be called multiple times, from + * this thread and we don't want to double-decref this lock */ + it->it_lock_mode = 0; + if (it->it_remote_lock_mode != 0) { + handle.cookie = it->it_remote_lock_handle; CDEBUG(D_DLMTRACE, "releasing remote lock with cookie" - LPX64" from it %p\n", handle.cookie, it); + "%#llx from it %p\n", handle.cookie, it); ldlm_lock_decref(&handle, - it->d.lustre.it_remote_lock_mode); - it->d.lustre.it_remote_lock_mode = 0; + it->it_remote_lock_mode); + it->it_remote_lock_mode = 0; } } } @@ -272,13 +224,14 @@ void ll_intent_release(struct lookup_intent *it) ll_intent_drop_lock(it); /* We are still holding extra reference on a request, need to free it */ if (it_disposition(it, DISP_ENQ_OPEN_REF)) - ptlrpc_req_finished(it->d.lustre.it_data); /* ll_file_open */ - if (it_disposition(it, DISP_ENQ_CREATE_REF)) /* create rec */ - ptlrpc_req_finished(it->d.lustre.it_data); + ptlrpc_req_finished(it->it_request); /* ll_file_open */ - it->d.lustre.it_disposition = 0; - it->d.lustre.it_data = NULL; - EXIT; + if (it_disposition(it, DISP_ENQ_CREATE_REF)) /* create rec */ + ptlrpc_req_finished(it->it_request); + + it->it_disposition = 0; + it->it_request = NULL; + EXIT; } void ll_invalidate_aliases(struct inode *inode) @@ -293,7 +246,7 @@ void ll_invalidate_aliases(struct inode *inode) PFID(ll_inode2fid(inode)), inode); ll_lock_dcache(inode); - ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry, d_alias) { + ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry) { CDEBUG(D_DENTRY, "dentry in drop %.*s (%p) parent %p " "inode %p flags %d\n", dentry->d_name.len, dentry->d_name.name, dentry, dentry->d_parent, @@ -337,7 +290,7 @@ void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry) LASSERT(it != NULL); LASSERT(dentry != NULL); - if (it->d.lustre.it_lock_mode && dentry->d_inode != NULL) { + if (it->it_lock_mode && dentry->d_inode != NULL) { struct inode *inode = dentry->d_inode; struct ll_sb_info *sbi = ll_i2sbi(dentry->d_inode); @@ -355,33 +308,35 @@ void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry) } } -void ll_frob_intent(struct lookup_intent **itp, struct lookup_intent *deft) -{ - struct lookup_intent *it = *itp; - - if (!it || it->it_op == IT_GETXATTR) - it = *itp = deft; - -} - static int ll_revalidate_dentry(struct dentry *dentry, unsigned int lookup_flags) { struct inode *dir = dentry->d_parent->d_inode; + /* If this is intermediate component path lookup and we were able to get + * to this dentry, then its lock has not been revoked and the + * path component is valid. */ + if (lookup_flags & (LOOKUP_CONTINUE | LOOKUP_PARENT)) + return 1; + + /* Symlink - always valid as long as the dentry was found */ +#ifdef HAVE_IOP_GET_LINK + if (dentry->d_inode && dentry->d_inode->i_op->get_link) +#else + if (dentry->d_inode && dentry->d_inode->i_op->follow_link) +#endif + return 1; + /* - * if open&create is set, talk to MDS to make sure file is created if - * necessary, because we can't do this in ->open() later since that's - * called on an inode. return 0 here to let lookup to handle this. + * VFS warns us that this is the second go around and previous + * operation failed (most likely open|creat), so this time + * we better talk to the server via the lookup path by name, + * not by fid. */ - if ((lookup_flags & (LOOKUP_OPEN | LOOKUP_CREATE)) == - (LOOKUP_OPEN | LOOKUP_CREATE)) + if (lookup_flags & LOOKUP_REVAL) return 0; - if (lookup_flags & (LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE)) - return 1; - - if (d_need_statahead(dir, dentry) <= 0) + if (!dentry_may_statahead(dir, dentry)) return 1; #ifndef HAVE_DCACHE_LOCK @@ -389,8 +344,7 @@ static int ll_revalidate_dentry(struct dentry *dentry, return -ECHILD; #endif - do_statahead_enter(dir, &dentry, dentry->d_inode == NULL); - ll_statahead_mark(dir, dentry); + ll_statahead(dir, &dentry, dentry->d_inode == NULL); return 1; } @@ -398,7 +352,7 @@ static int ll_revalidate_dentry(struct dentry *dentry, * Always trust cached dentries. Update statahead window if necessary. */ #ifdef HAVE_IOP_ATOMIC_OPEN -int ll_revalidate_nd(struct dentry *dentry, unsigned int flags) +static int ll_revalidate_nd(struct dentry *dentry, unsigned int flags) { int rc; ENTRY; @@ -410,7 +364,7 @@ int ll_revalidate_nd(struct dentry *dentry, unsigned int flags) RETURN(rc); } #else -int ll_revalidate_nd(struct dentry *dentry, struct nameidata *nd) +static int ll_revalidate_nd(struct dentry *dentry, struct nameidata *nd) { int rc; ENTRY; @@ -430,18 +384,9 @@ int ll_revalidate_nd(struct dentry *dentry, struct nameidata *nd) } #endif -void ll_d_iput(struct dentry *de, struct inode *inode) -{ - LASSERT(inode); - if (!find_cbdata(inode)) - clear_nlink(inode); - iput(inode); -} - -struct dentry_operations ll_d_ops = { +const struct dentry_operations ll_d_ops = { .d_revalidate = ll_revalidate_nd, .d_release = ll_release, .d_delete = ll_ddelete, - .d_iput = ll_d_iput, .d_compare = ll_dcompare, };