Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b80e0d27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix fuse_file_lseek returning with lock held
parents 83826dc5 5291658d

fs/fuse/file.c

+2 −1
Original line number Diff line number Diff line
@@ -1465,7 +1465,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin) 
	case SEEK_END:

		retval = fuse_update_attributes(inode, NULL, file, NULL);

		if (retval)

			return retval;

			goto exit;

		offset += i_size_read(inode);

		break;

	case SEEK_CUR:
@@ -1479,6 +1479,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin) 
		}

		retval = offset;

	}

exit:

	mutex_unlock(&inode->i_mutex);

	return retval;

}