git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
fs
/
ocfs2
/
namei.c
diff --git
a/fs/ocfs2/namei.c
b/fs/ocfs2/namei.c
index
ca35f81
..
30c5231
100644
(file)
--- a/
fs/ocfs2/namei.c
+++ b/
fs/ocfs2/namei.c
@@
-147,7
+147,7
@@
static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
spin_unlock(&oi->ip_lock);
bail_add:
spin_unlock(&oi->ip_lock);
bail_add:
- d
entry->d_op = &ocfs2_dentry_ops
;
+ d
_set_d_op(dentry, &ocfs2_dentry_ops)
;
ret = d_splice_alias(inode, dentry);
if (inode) {
ret = d_splice_alias(inode, dentry);
if (inode) {
@@
-415,7
+415,7
@@
static int ocfs2_mknod(struct inode *dir,
mlog_errno(status);
goto leave;
}
mlog_errno(status);
goto leave;
}
- d
entry->d_op = &ocfs2_dentry_ops
;
+ d
_set_d_op(dentry, &ocfs2_dentry_ops)
;
status = ocfs2_add_entry(handle, dentry, inode,
OCFS2_I(inode)->ip_blkno, parent_fe_bh,
status = ocfs2_add_entry(handle, dentry, inode,
OCFS2_I(inode)->ip_blkno, parent_fe_bh,
@@
-743,7
+743,7
@@
static int ocfs2_link(struct dentry *old_dentry,
}
ihold(inode);
}
ihold(inode);
- d
entry->d_op = &ocfs2_dentry_ops
;
+ d
_set_d_op(dentry, &ocfs2_dentry_ops)
;
d_instantiate(dentry, inode);
out_commit:
d_instantiate(dentry, inode);
out_commit:
@@
-1797,7
+1797,7
@@
static int ocfs2_symlink(struct inode *dir,
mlog_errno(status);
goto bail;
}
mlog_errno(status);
goto bail;
}
- d
entry->d_op = &ocfs2_dentry_ops
;
+ d
_set_d_op(dentry, &ocfs2_dentry_ops)
;
status = ocfs2_add_entry(handle, dentry, inode,
le64_to_cpu(fe->i_blkno), parent_fe_bh,
status = ocfs2_add_entry(handle, dentry, inode,
le64_to_cpu(fe->i_blkno), parent_fe_bh,
@@
-2462,7
+2462,7
@@
int ocfs2_mv_orphaned_inode_to_new(struct inode *dir,
goto out_commit;
}
goto out_commit;
}
- d
entry->d_op = &ocfs2_dentry_ops
;
+ d
_set_d_op(dentry, &ocfs2_dentry_ops)
;
d_instantiate(dentry, inode);
status = 0;
out_commit:
d_instantiate(dentry, inode);
status = 0;
out_commit: