From daaae8a1300b5da3561fa59e12b7f07f98bf9c03 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 11 Jun 2008 17:55:42 -0400
Subject: [PATCH] --- yaml --- r: 101910 b: refs/heads/master c:
 cc0dd2d1052aede2946ad1338a8f6f5d5c604740 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfs/dir.c  | 7 +++++--
 trunk/fs/nfs/file.c | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8c064e055c1e..b5853f6938ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b84e06c58fdefdc42931f771dc295e63f4b27365
+refs/heads/master: cc0dd2d1052aede2946ad1338a8f6f5d5c604740
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 24571067bf72..c962233c094a 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -133,8 +133,11 @@ nfs_opendir(struct inode *inode, struct file *filp)
 {
 	int res;
 
-	dfprintk(VFS, "NFS: opendir(%s/%ld)\n",
-			inode->i_sb->s_id, inode->i_ino);
+	dfprintk(VFS, "NFS: open dir(%s/%s)\n",
+			filp->f_path.dentry->d_parent->d_name.name,
+			filp->f_path.dentry->d_name.name);
+
+	nfs_inc_stats(inode, NFSIOS_VFSOPEN);
 
 	lock_kernel();
 	/* Call generic open code in order to cache credentials */
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index cef36362c9eb..202408d96ee8 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -119,6 +119,10 @@ nfs_file_open(struct inode *inode, struct file *filp)
 {
 	int res;
 
+	dfprintk(VFS, "NFS: open file(%s/%s)\n",
+			filp->f_path.dentry->d_parent->d_name.name,
+			filp->f_path.dentry->d_name.name);
+
 	res = nfs_check_flags(filp->f_flags);
 	if (res)
 		return res;