NFS: Remove unnecessary inode locking in nfs_llseek_dir()
Subsystems (2)
[email protected]
maintainerPATCH 1/2 NFS: Remove unnecessary inode locking in nfs_llseek_dir()
From: Trond Myklebust <[email protected]>
Remove the contentious inode lock, and instead provide thread safety using the file->f_lock spinlock.
--- fs/nfs/dir.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/nfs/dir.c +4 -5
@@ -955,7 +955,6 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx)static loff_t nfs_llseek_dir (struct file *filp,loff_t offset,int whence) { -struct inode *inode =file_inode (filp);struct nfs_open_dir_context *dir_ctx = filp->private_data; dfprintk(FILE, "NFS: llseek dir(%pD2, %lld, %d)\n",
@@ -967,15 +966,15 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int whence)case SEEK_SET :if (offset <0 )return -EINVAL ; -inode_lock (inode); +spin_lock (&filp->f_lock);break ;case SEEK_CUR :if (offset ==0 )return filp->f_pos; -inode_lock (inode); +spin_lock (&filp->f_lock); offset += filp->f_pos;if (offset <0 ) { -inode_unlock (inode); +spin_unlock (&filp->f_lock);return -EINVAL ; } }
@@ -987,7 +986,7 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int whence) dir_ctx->dir_cookie =0 ; dir_ctx->duped =0 ; } -inode_unlock (inode); +spin_unlock (&filp->f_lock);return offset; }
Signature · 1 line
2.28.0
[email protected]
maintainerPATCH 2/2 NFS: Remove unnecessary inode lock in nfs_fsync_dir()
From: Trond Myklebust <[email protected]>
nfs_inc_stats() is already thread-safe, and there are no other reasons to hold the inode lock here.
--- fs/nfs/dir.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
fs/nfs/dir.c +1 -5
@@ -997,13 +997,9 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int whence)static int nfs_fsync_dir (struct file *filp,loff_t start,loff_t end,int datasync) { -struct inode *inode =file_inode (filp); -dfprintk (FILE ,"NFS: fsync dir(%pD2) datasync %d\n" , filp, datasync); -inode_lock (inode); -nfs_inc_stats (inode,NFSIOS_VFSFSYNC ); -inode_unlock (inode); +nfs_inc_stats (file_inode (filp),NFSIOS_VFSFSYNC );return 0 ; }
Signature · 1 line
2.28.0
Re: [PATCH 2/2] NFS: Remove unnecessary inode lock in nfs_fsync_dir()
Quoted 6 lines · On 30 Oct 2020, at 17:57, [email protected] wrote:
From: Trond Myklebust <[email protected]>
nfs_inc_stats()is already thread-safe, and there are no other reasons to hold the inode lock here.Signed-off-by Trond Myklebust <[email protected]>
Ben
Quoted 6 lines · On 30 Oct 2020, at 17:57, [email protected] wrote:
From: Trond Myklebust <[email protected]>
Remove the contentious inode lock, and instead provide thread safety using the
file->f_lockspinlock.Signed-off-by Trond Myklebust <[email protected]>
Ben