diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-25 20:27:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-25 20:27:18 -0500 |
| commit | 80a755545d54c8e9fd801f0de3d015defd825659 (patch) | |
| tree | 91005c6d92ef474f8f3ee22c9deb51cc5517ee87 /arch/cris | |
| parent | bfc835b5716fd86b568d4f9b15be04c4f361082b (diff) | |
| parent | fb32c76d16aa40f3057f53273ac483a8e2468004 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"A couple of fixes - deadlock in CIFS and build breakage in cris serial
driver (resurfaced f_dentry in there)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
VFS: Convert file->f_dentry->d_inode to file_inode()
fix deadlock in cifs_ioctl_clone()
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v32/drivers/sync_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c index 08a313fc2241..f772068d9e79 100644 --- a/arch/cris/arch-v32/drivers/sync_serial.c +++ b/arch/cris/arch-v32/drivers/sync_serial.c | |||
| @@ -604,7 +604,7 @@ static ssize_t __sync_serial_read(struct file *file, | |||
| 604 | struct timespec *ts) | 604 | struct timespec *ts) |
| 605 | { | 605 | { |
| 606 | unsigned long flags; | 606 | unsigned long flags; |
| 607 | int dev = MINOR(file->f_dentry->d_inode->i_rdev); | 607 | int dev = MINOR(file_inode(file)->i_rdev); |
| 608 | int avail; | 608 | int avail; |
| 609 | struct sync_port *port; | 609 | struct sync_port *port; |
| 610 | unsigned char *start; | 610 | unsigned char *start; |