Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43616
b: refs/heads/master
c: 45e0798
h: refs/heads/master
v: v3
  • Loading branch information
Josef Sipek authored and Linus Torvalds committed Dec 8, 2006
1 parent 4ea764a commit 8a99b89
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7bc563239e4c276afebd11d2e6e67ddc0cc65f0d
refs/heads/master: 45e079810a27d4a072347d90d405948f95cee812
6 changes: 3 additions & 3 deletions trunk/arch/sparc/kernel/sys_sunos.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ asmlinkage unsigned long sunos_mmap(unsigned long addr, unsigned long len,
* SunOS is so stupid some times... hmph!
*/
if (file) {
if (imajor(file->f_dentry->d_inode) == MEM_MAJOR &&
iminor(file->f_dentry->d_inode) == 5) {
if (imajor(file->f_path.dentry->d_inode) == MEM_MAJOR &&
iminor(file->f_path.dentry->d_inode) == 5) {
flags |= MAP_ANONYMOUS;
fput(file);
file = NULL;
Expand Down Expand Up @@ -655,7 +655,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr)
if (!file)
goto out;

inode = file->f_dentry->d_inode;
inode = file->f_path.dentry->d_inode;

socket = SOCKET_I(inode);
local.sin_family = AF_INET;
Expand Down

0 comments on commit 8a99b89

Please sign in to comment.