2008-03-21 23:02:33

by Chuck Lever III

[permalink] [raw]
Subject: [PATCH 3/5] NFS: Make nfs_llseek methods consistent

Clean up: Report the same debugging info in nfs_llseek_dir() and
nfs_llseek_file().

Signed-off-by: Chuck Lever <[email protected]>
---

fs/nfs/dir.c | 12 ++++++++++--
fs/nfs/file.c | 7 +++++++
2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 534a811..63f8f1c 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -603,7 +603,15 @@ out:

static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
{
- mutex_lock(&filp->f_path.dentry->d_inode->i_mutex);
+ struct dentry *dentry = filp->f_path.dentry;
+ struct inode *inode = filp->f_path.dentry->d_inode;
+
+ dfprintk(VFS, "NFS: llseek dir(%s/%s, %Ld, %d)\n",
+ dentry->d_parent->d_name.name,
+ dentry->d_name.name,
+ offset, origin);
+
+ mutex_lock(&inode->i_mutex);
switch (origin) {
case 1:
offset += filp->f_pos;
@@ -619,7 +627,7 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
nfs_file_open_context(filp)->dir_cookie = 0;
}
out:
- mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex);
+ mutex_unlock(&inode->i_mutex);
return offset;
}

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 38424eb..7776a89 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -166,6 +166,13 @@ force_reval:

static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
{
+ struct dentry *dentry = filp->f_path.dentry;
+
+ dfprintk(VFS, "NFS: llseek file(%s/%s, %Ld, %d)\n",
+ dentry->d_parent->d_name.name,
+ dentry->d_name.name,
+ offset, origin);
+
/* origin == SEEK_END => we must revalidate the cached file length */
if (origin == SEEK_END) {
struct inode *inode = filp->f_mapping->host;