diff options
| author | Linus Torvalds | 2016-01-23 12:24:56 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-01-23 12:24:56 -0800 |
| commit | cc673757e24d018d64ff8038e28835db1e2902c4 (patch) | |
| tree | 6eab3dab15725cda04dafabe9a8440697dca26cc /fs/ncpfs/file.c | |
| parent | fa7d9a1d286e6bab49ffa59cbd3c8b394ce54339 (diff) | |
| parent | e62e560fc8b65ef5debc9041a792d18a8f98b2ca (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull final vfs updates from Al Viro:
- The ->i_mutex wrappers (with small prereq in lustre)
- a fix for too early freeing of symlink bodies on shmem (they need to
be RCU-delayed) (-stable fodder)
- followup to dedupe stuff merged this cycle
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vfs: abort dedupe loop if fatal signals are pending
make sure that freeing shmem fast symlinks is RCU-delayed
wrappers for ->i_mutex access
lustre: remove unused declaration
Diffstat (limited to 'fs/ncpfs/file.c')
| -rw-r--r-- | fs/ncpfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index 011324ce9df2..dd38ca1f2ecb 100644 --- a/fs/ncpfs/file.c +++ b/fs/ncpfs/file.c @@ -224,10 +224,10 @@ ncp_file_write_iter(struct kiocb *iocb, struct iov_iter *from) iocb->ki_pos = pos; if (pos > i_size_read(inode)) { - mutex_lock(&inode->i_mutex); + inode_lock(inode); if (pos > i_size_read(inode)) i_size_write(inode, pos); - mutex_unlock(&inode->i_mutex); + inode_unlock(inode); } ncp_dbg(1, "exit %pD2\n", file); outrel: |