diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
| commit | 7acb77a6e7bddd4c4c5aa975bbf976927c013798 (patch) | |
| tree | 4139829ec6edb85f73774bb95cdec376758bfc73 /fs/proc/openpromfs.c | |
| parent | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (diff) | |
Merge with 2.1.43.
Diffstat (limited to 'fs/proc/openpromfs.c')
| -rw-r--r-- | fs/proc/openpromfs.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/proc/openpromfs.c b/fs/proc/openpromfs.c index a9f84b9eb..7d741cfaf 100644 --- a/fs/proc/openpromfs.c +++ b/fs/proc/openpromfs.c @@ -1,4 +1,4 @@ -/* $Id: openpromfs.c,v 1.13 1997/04/03 08:49:25 davem Exp $ +/* $Id: openpromfs.c,v 1.15 1997/06/05 01:28:11 davem Exp $ * openpromfs.c: /proc/openprom handling routines * * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -484,7 +484,6 @@ static struct inode_operations openpromfs_prop_inode_ops = { NULL, /* mknod */ NULL, /* rename */ NULL, /* readlink */ - NULL, /* follow_link */ NULL, /* readpage */ NULL, /* writepage */ NULL, /* bmap */ @@ -517,7 +516,6 @@ static struct inode_operations openpromfs_nodenum_inode_ops = { NULL, /* mknod */ NULL, /* rename */ NULL, /* readlink */ - NULL, /* follow_link */ NULL, /* readpage */ NULL, /* writepage */ NULL, /* bmap */ @@ -550,7 +548,6 @@ static struct inode_operations openprom_alias_inode_operations = { NULL, /* mknod */ NULL, /* rename */ NULL, /* readlink */ - NULL, /* follow_link */ NULL, /* readpage */ NULL, /* writepage */ NULL, /* bmap */ @@ -1015,7 +1012,7 @@ void openpromfs_use (struct inode *inode, int inc) static int usec = 0; if (inc) { - if (inode->i_count == 1) + if (atomic_read(&inode->i_count) == 1) usec++; else if (root_fresh && inode->i_ino == PROC_OPENPROM_FIRST) { root_fresh = 0; @@ -1028,10 +1025,10 @@ void openpromfs_use (struct inode *inode, int inc) usec--; } printk ("openpromfs_use: %d %d %d %d\n", - inode->i_ino, inc, usec, inode->i_count); + inode->i_ino, inc, usec, atomic_read(&inode->i_count)); #else if (inc) { - if (inode->i_count == 1) + if (atomic_read(&inode->i_count) == 1) MOD_INC_USE_COUNT; else if (root_fresh && inode->i_ino == PROC_OPENPROM_FIRST) { root_fresh = 0; |