ocfs2: Remove special casing for inode creation in ocfs2_dentry_attach_lock()
We can't use LKM_LOCAL for new dentry locks because an unlink and subsequent
re-create of a name/inode pair may result in the lock still being mastered
somewhere in the cluster.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index 18a3190..014e739 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -183,9 +183,6 @@
* The dir cluster lock (held at either PR or EX mode) protects us
* from unlink and rename on other nodes.
*
- * The 'create' flag tells us whether we're doing this as a result of
- * a file creation.
- *
* A dput() can happen asynchronously due to pruning, so we cover
* attaching and detaching the dentry lock with a
* dentry_attach_lock.
@@ -199,16 +196,15 @@
*/
int ocfs2_dentry_attach_lock(struct dentry *dentry,
struct inode *inode,
- u64 parent_blkno,
- int create)
+ u64 parent_blkno)
{
int ret;
struct dentry *alias;
struct ocfs2_dentry_lock *dl = dentry->d_fsdata;
- mlog(0, "Attach \"%.*s\", parent %llu, create %d, fsdata: %p\n",
+ mlog(0, "Attach \"%.*s\", parent %llu, fsdata: %p\n",
dentry->d_name.len, dentry->d_name.name,
- (unsigned long long)parent_blkno, create, dl);
+ (unsigned long long)parent_blkno, dl);
/*
* Negative dentry. We ignore these for now.
@@ -242,10 +238,9 @@
* since we have it pinned, so our reference is safe.
*/
dl = alias->d_fsdata;
- mlog_bug_on_msg(!dl, "parent %llu, ino %llu, create %d\n",
+ mlog_bug_on_msg(!dl, "parent %llu, ino %llu\n",
(unsigned long long)parent_blkno,
- (unsigned long long)OCFS2_I(inode)->ip_blkno,
- create);
+ (unsigned long long)OCFS2_I(inode)->ip_blkno);
mlog_bug_on_msg(dl->dl_parent_blkno != parent_blkno,
" \"%.*s\": old parent: %llu, new: %llu\n",
@@ -284,31 +279,16 @@
spin_unlock(&dentry_attach_lock);
/*
- * Creation of a new file means that nobody can possibly have
- * this name in the system, which means that acquiry of those
- * locks can easily be optimized.
- */
- if (create) {
- ret = ocfs2_create_new_lock(OCFS2_SB(inode->i_sb),
- &dl->dl_lockres, 0);
- if (ret)
- mlog_errno(ret);
- goto out;
- }
-
- /*
* This actually gets us our PRMODE level lock. From now on,
* we'll have a notification if one of these names is
* destroyed on another node.
*/
ret = ocfs2_dentry_lock(dentry, 0);
- if (ret) {
+ if (!ret)
+ ocfs2_dentry_unlock(dentry, 0);
+ else
mlog_errno(ret);
- goto out;
- }
- ocfs2_dentry_unlock(dentry, 0);
-out:
dput(alias);
return ret;
@@ -419,8 +399,7 @@
ocfs2_dentry_lock_put(osb, dentry->d_fsdata);
dentry->d_fsdata = NULL;
- ret = ocfs2_dentry_attach_lock(dentry, inode,
- OCFS2_I(new_dir)->ip_blkno, 0);
+ ret = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(new_dir)->ip_blkno);
if (ret)
mlog_errno(ret);
diff --git a/fs/ocfs2/dcache.h b/fs/ocfs2/dcache.h
index e53abe7..c091c34 100644
--- a/fs/ocfs2/dcache.h
+++ b/fs/ocfs2/dcache.h
@@ -42,7 +42,7 @@
};
int ocfs2_dentry_attach_lock(struct dentry *dentry, struct inode *inode,
- u64 parent_blkno, int create);
+ u64 parent_blkno);
void ocfs2_dentry_lock_put(struct ocfs2_super *osb,
struct ocfs2_dentry_lock *dl);
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 5a942e0..6fa9788 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -217,7 +217,7 @@
dentry = ret;
status = ocfs2_dentry_attach_lock(dentry, inode,
- OCFS2_I(dir)->ip_blkno, 0);
+ OCFS2_I(dir)->ip_blkno);
if (status) {
mlog_errno(status);
ret = ERR_PTR(status);
@@ -441,7 +441,7 @@
}
status = ocfs2_dentry_attach_lock(dentry, inode,
- OCFS2_I(dir)->ip_blkno, 1);
+ OCFS2_I(dir)->ip_blkno);
if (status) {
mlog_errno(status);
goto leave;
@@ -754,8 +754,7 @@
goto bail;
}
- err = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(dir)->ip_blkno,
- 0);
+ err = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(dir)->ip_blkno);
if (err) {
mlog_errno(err);
goto bail;
@@ -1716,8 +1715,7 @@
goto bail;
}
- status = ocfs2_dentry_attach_lock(dentry, inode,
- OCFS2_I(dir)->ip_blkno, 1);
+ status = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(dir)->ip_blkno);
if (status) {
mlog_errno(status);
goto bail;