projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda' into for-next
[deliverable/linux.git]
/
ipc
/
shm.c
diff --git
a/ipc/shm.c
b/ipc/shm.c
index d280a74af2ef47d63fbaf3215cb68832b68c7c76..6d767071c3673dce09984933c3a444d78880bd10 100644
(file)
--- a/
ipc/shm.c
+++ b/
ipc/shm.c
@@
-1132,7
+1132,7
@@
long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
path = shp->shm_file->f_path;
path_get(&path);
shp->shm_nattch++;
- size = i_size_read(
path.dentry->d_inode
);
+ size = i_size_read(
d_inode(path.dentry)
);
ipc_unlock_object(&shp->shm_perm);
rcu_read_unlock();
This page took
0.023839 seconds
and
5
git commands to generate.