Merge branch 'thinkpad' into release

[firefly-linux-kernel-4.4.55.git] / fs / udf / file.c

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 7464305382b5e1d287cc6a435d1d60c077a0948d..b80cbd78833cf7aa99430016b84f29b038d5e098 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -193,9 +193,11 @@ int udf_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
 static int udf_release_file(struct inode *inode, struct file *filp)
 {
        if (filp->f_mode & FMODE_WRITE) {
+               mutex_lock(&inode->i_mutex);
                lock_kernel();
                udf_discard_prealloc(inode);
                unlock_kernel();
+               mutex_unlock(&inode->i_mutex);
        }
        return 0;
 }