aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-06-11 17:55:34 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-09 12:09:01 -0400
commitb84e06c58fdefdc42931f771dc295e63f4b27365 (patch)
tree1018cbbb7559b928ee1ae7e29663de81ba56ef6b /fs/nfs/dir.c
parent549177863bac22f23663ee9f70c4e3b9fb269f2c (diff)
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 <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r--fs/nfs/dir.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 5d73fbd67070..24571067bf72 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -603,7 +603,15 @@ out:
603 603
604static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin) 604static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
605{ 605{
606 mutex_lock(&filp->f_path.dentry->d_inode->i_mutex); 606 struct dentry *dentry = filp->f_path.dentry;
607 struct inode *inode = dentry->d_inode;
608
609 dfprintk(VFS, "NFS: llseek dir(%s/%s, %lld, %d)\n",
610 dentry->d_parent->d_name.name,
611 dentry->d_name.name,
612 offset, origin);
613
614 mutex_lock(&inode->i_mutex);
607 switch (origin) { 615 switch (origin) {
608 case 1: 616 case 1:
609 offset += filp->f_pos; 617 offset += filp->f_pos;
@@ -619,7 +627,7 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
619 nfs_file_open_context(filp)->dir_cookie = 0; 627 nfs_file_open_context(filp)->dir_cookie = 0;
620 } 628 }
621out: 629out:
622 mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex); 630 mutex_unlock(&inode->i_mutex);
623 return offset; 631 return offset;
624} 632}
625 633