patch-2.1.45 linux/fs/nfs/file.c

• Lines: 23
• Date: Wed Jul 16 11:41:19 1997
• Orig file: v2.1.44/linux/fs/nfs/file.c
• Orig date: Mon Jul 7 10:53:54 1997

diff -u --recursive --new-file v2.1.44/linux/fs/nfs/file.c linux/fs/nfs/file.c
@@ -143,7 +143,7 @@
 	int	result;
 
 	dfprintk(VFS, "nfs: write(%x/%ld (%d), %lu@%lu)\n",
-			inode->i_dev, inode->i_ino, atomic_read(&inode->i_count),
+			inode->i_dev, inode->i_ino, inode->i_count,
 			count, (unsigned long) file->f_pos);
 
 	if (!inode) {
@@ -180,11 +180,11 @@
 	int	status;
 
 	dprintk("NFS: nfs_lock(f=%4x/%ld, t=%x, fl=%x, r=%ld:%ld)\n",
-			filp->f_inode->i_dev, filp->f_inode->i_ino,
+			filp->f_dentry->d_inode->i_dev, filp->f_dentry->d_inode->i_ino,
 			fl->fl_type, fl->fl_flags,
 			fl->fl_start, fl->fl_end);
 
-	if (!(inode = filp->f_inode))
+	if (!(inode = filp->f_dentry->d_inode))
 		return -EINVAL;
 
 	/* No mandatory locks over NFS */