diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:24:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:24:41 -0800 |
| commit | 96c4fbbe32bf8aaace615f5ad2469f5531dae781 (patch) | |
| tree | b3b3bd990d8a19c595f810b508a4262d1b9973db /ipc | |
| parent | 975675b97f86323933d8f15b83660a60255988f7 (diff) | |
v2.4.12.3 -> v2.4.12.4
- Al Viro: mnt_list init
- Jeff Garzik: network driver update (license tags, tulip driver)
- David Miller: sparc, net updates
- Ben Collins: firewire update
- Gerd Knorr: btaudio/bttv update
- Tim Hockin: MD cleanups
- Greg KH, Petko Manolov: USB updates
- Leonard Zubkoff: DAC960 driver update
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 1c8c5c5cdd25..fb2ba9d0ba8b 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -348,6 +348,7 @@ static inline unsigned long copy_shminfo_to_user(void *buf, struct shminfo64 *in static void shm_get_stat (unsigned long *rss, unsigned long *swp) { + struct shmem_inode_info *info; int i; *rss = 0; @@ -361,10 +362,11 @@ static void shm_get_stat (unsigned long *rss, unsigned long *swp) if(shp == NULL) continue; inode = shp->shm_file->f_dentry->d_inode; - spin_lock (&inode->u.shmem_i.lock); + info = SHMEM_I(inode); + spin_lock (&info->lock); *rss += inode->i_mapping->nrpages; - *swp += inode->u.shmem_i.swapped; - spin_unlock (&inode->u.shmem_i.lock); + *swp += info->swapped; + spin_unlock (&info->lock); } } |