Merge branch 'for_linus' into for_next

This commit is contained in:
Jan Kara 2015-01-30 10:16:33 +01:00
commit 1cd6b7be92
248 changed files with 2656 additions and 1579 deletions

View file

@ -224,7 +224,7 @@ out:
static int udf_release_file(struct inode *inode, struct file *filp)
{
if (filp->f_mode & FMODE_WRITE &&
atomic_read(&inode->i_writecount) > 1) {
atomic_read(&inode->i_writecount) == 1) {
/*
* Grab i_mutex to avoid races with writes changing i_size
* while we are running.