projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
fs
/
xfs
/
xfs_filestream.c
diff --git
a/fs/xfs/xfs_filestream.c
b/fs/xfs/xfs_filestream.c
index
8f9f854
..
da82f1c
100644
(file)
--- a/
fs/xfs/xfs_filestream.c
+++ b/
fs/xfs/xfs_filestream.c
@@
-294,7
+294,7
@@
xfs_filestream_get_parent(
if (!parent)
goto out_dput;
- dir = igrab(
parent->d_inode
);
+ dir = igrab(
d_inode(parent)
);
dput(parent);
out_dput: