AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging/lustre/llite: Get rid of ll_lock_dcache/ll_unlock_dcache

Browse Source 
These are just doing spin_lock/unlock on inode's i_lock,
so just do the spinlock directly to make the code more clear

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin 2016-06-20 16:55:26 -04:00 committed by Greg Kroah-Hartman
parent 411c9699df
commit 2bbec0ed2c
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/lustre/llite/dcache.c
View File

@ -249,7 +249,7 @@ void ll_invalidate_aliases(struct inode *inode)
CDEBUG(D_INODE, "marking dentries for ino "DFID"(%p) invalid\n", CDEBUG(D_INODE, "marking dentries for ino "DFID"(%p) invalid\n",
PFID(ll_inode2fid(inode)), inode); PFID(ll_inode2fid(inode)), inode);
ll_lock_dcache(inode); spin_lock(&inode->i_lock);
hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) { hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p inode %p flags %d\n", CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p inode %p flags %d\n",
dentry, dentry, dentry->d_parent, dentry, dentry, dentry->d_parent,
@ -257,7 +257,7 @@ void ll_invalidate_aliases(struct inode *inode)
d_lustre_invalidate(dentry, 0); d_lustre_invalidate(dentry, 0);
} }
ll_unlock_dcache(inode); spin_unlock(&inode->i_lock);
} }
int ll_revalidate_it_finish(struct ptlrpc_request *request, int ll_revalidate_it_finish(struct ptlrpc_request *request,

10
drivers/staging/lustre/lustre/llite/llite_internal.h
View File

@ -1229,16 +1229,6 @@ static inline void ll_set_lock_data(struct obd_export *exp, struct inode *inode,
*bits = it->d.lustre.it_lock_bits; *bits = it->d.lustre.it_lock_bits;
} }
static inline void ll_lock_dcache(struct inode *inode)
{
spin_lock(&inode->i_lock);
}
static inline void ll_unlock_dcache(struct inode *inode)
{
spin_unlock(&inode->i_lock);
}
static inline int d_lustre_invalid(const struct dentry *dentry) static inline int d_lustre_invalid(const struct dentry *dentry)
{ {
struct ll_dentry_data *lld = ll_d2d(dentry); struct ll_dentry_data *lld = ll_d2d(dentry);

8
drivers/staging/lustre/lustre/llite/namei.c
View File

@ -140,7 +140,7 @@ static void ll_invalidate_negative_children(struct inode *dir)
{ {
struct dentry *dentry, *tmp_subdir; struct dentry *dentry, *tmp_subdir;
ll_lock_dcache(dir); spin_lock(&dir->i_lock);
hlist_for_each_entry(dentry, &dir->i_dentry, d_u.d_alias) { hlist_for_each_entry(dentry, &dir->i_dentry, d_u.d_alias) {
spin_lock(&dentry->d_lock); spin_lock(&dentry->d_lock);
if (!list_empty(&dentry->d_subdirs)) { if (!list_empty(&dentry->d_subdirs)) {
@ -155,7 +155,7 @@ static void ll_invalidate_negative_children(struct inode *dir)
} }
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
} }
ll_unlock_dcache(dir); spin_unlock(&dir->i_lock);
} }
int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
@ -317,7 +317,7 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry)
discon_alias = NULL; discon_alias = NULL;
invalid_alias = NULL; invalid_alias = NULL;
ll_lock_dcache(inode); spin_lock(&inode->i_lock);
hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) { hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) {
LASSERT(alias != dentry); LASSERT(alias != dentry);
@ -342,7 +342,7 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry)
dget_dlock(alias); dget_dlock(alias);
spin_unlock(&alias->d_lock); spin_unlock(&alias->d_lock);
} }
ll_unlock_dcache(inode); spin_unlock(&inode->i_lock);
return alias; return alias;
} }