projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dmaengine-fix-4.5-rc7' of git://git.infradead.org/users/vkoul/slave-dma
[deliverable/linux.git]
/
fs
/
nfs
/
dir.c
diff --git
a/fs/nfs/dir.c
b/fs/nfs/dir.c
index c82a21228a342a8f4e6c42ea0d0366b225cb0c74..9cce67043f92a589193625ca3005d0b1e0f4e36b 100644
(file)
--- a/
fs/nfs/dir.c
+++ b/
fs/nfs/dir.c
@@
-940,7
+940,7
@@
static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int whence)
dfprintk(FILE, "NFS: llseek dir(%pD2, %lld, %d)\n",
filp, offset, whence);
dfprintk(FILE, "NFS: llseek dir(%pD2, %lld, %d)\n",
filp, offset, whence);
-
mutex_lock(&inode->i_mutex
);
+
inode_lock(inode
);
switch (whence) {
case 1:
offset += filp->f_pos;
switch (whence) {
case 1:
offset += filp->f_pos;
@@
-957,7
+957,7
@@
static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int whence)
dir_ctx->duped = 0;
}
out:
dir_ctx->duped = 0;
}
out:
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
return offset;
}
return offset;
}
@@
-972,9
+972,9
@@
static int nfs_fsync_dir(struct file *filp, loff_t start, loff_t end,
dfprintk(FILE, "NFS: fsync dir(%pD2) datasync %d\n", filp, datasync);
dfprintk(FILE, "NFS: fsync dir(%pD2) datasync %d\n", filp, datasync);
-
mutex_lock(&inode->i_mutex
);
+
inode_lock(inode
);
nfs_inc_stats(inode, NFSIOS_VFSFSYNC);
nfs_inc_stats(inode, NFSIOS_VFSFSYNC);
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
return 0;
}
return 0;
}
This page took
0.028318 seconds
and
5
git commands to generate.