patch-2.1.45 linux/fs/lockd/svclock.c

• Lines: 44
• Date: Sun Jul 13 21:20:10 1997
• Orig file: v2.1.44/linux/fs/lockd/svclock.c
• Orig date: Mon Apr 7 11:35:30 1997

diff -u --recursive --new-file v2.1.44/linux/fs/lockd/svclock.c linux/fs/lockd/svclock.c
@@ -274,8 +274,8 @@
 	int			error;
 
 	dprintk("lockd: nlmsvc_lock(%04x/%ld, ty=%d, pi=%d, %ld-%ld, bl=%d)\n",
-				file->f_file.f_inode->i_dev,
-				file->f_file.f_inode->i_ino,
+				file->f_file.f_dentry->d_inode->i_dev,
+				file->f_file.f_dentry->d_inode->i_ino,
 				lock->fl.fl_type, lock->fl.fl_pid,
 				lock->fl.fl_start,
 				lock->fl.fl_end,
@@ -344,8 +344,8 @@
 	struct file_lock	*fl;
 
 	dprintk("lockd: nlmsvc_testlock(%04x/%ld, ty=%d, %ld-%ld)\n",
-				file->f_file.f_inode->i_dev,
-				file->f_file.f_inode->i_ino,
+				file->f_file.f_dentry->d_inode->i_dev,
+				file->f_file.f_dentry->d_inode->i_ino,
 				lock->fl.fl_type,
 				lock->fl.fl_start,
 				lock->fl.fl_end);
@@ -375,8 +375,8 @@
 	int	error;
 
 	dprintk("lockd: nlmsvc_unlock(%04x/%ld, pi=%d, %ld-%ld)\n",
-				file->f_file.f_inode->i_dev,
-				file->f_file.f_inode->i_ino,
+				file->f_file.f_dentry->d_inode->i_dev,
+				file->f_file.f_dentry->d_inode->i_ino,
 				lock->fl.fl_pid,
 				lock->fl.fl_start,
 				lock->fl.fl_end);
@@ -403,8 +403,8 @@
 	struct nlm_block	*block;
 
 	dprintk("lockd: nlmsvc_cancel(%04x/%ld, pi=%d, %ld-%ld)\n",
-				file->f_file.f_inode->i_dev,
-				file->f_file.f_inode->i_ino,
+				file->f_file.f_dentry->d_inode->i_dev,
+				file->f_file.f_dentry->d_inode->i_ino,
 				lock->fl.fl_pid,
 				lock->fl.fl_start,
 				lock->fl.fl_end);