diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-06-17 14:44:05 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-06-17 14:44:05 -0400 |
| commit | 4ef51e8b7aaa67493ad5b36a0e5874bf6ff8b956 (patch) | |
| tree | 932b180b18a96120ac68f85f7de0d3cdac320b1b /fs/ufs/inode.c | |
| parent | b853a16176cf3e02c57e215743015614152c2428 (diff) | |
| parent | e4f95517f18271b1da36cfc5d700e46844396d6e (diff) | |
| download | talos-op-linux-4ef51e8b7aaa67493ad5b36a0e5874bf6ff8b956.tar.gz talos-op-linux-4ef51e8b7aaa67493ad5b36a0e5874bf6ff8b956.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'fs/ufs/inode.c')
| -rw-r--r-- | fs/ufs/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 99aaf5c9bf4d..f913a6924b23 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -903,6 +903,9 @@ void ufs_evict_inode(struct inode * inode) invalidate_inode_buffers(inode); clear_inode(inode); - if (want_delete) + if (want_delete) { + lock_ufs(inode->i_sb); ufs_free_inode(inode); + unlock_ufs(inode->i_sb); + } } |
