aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-25 17:27:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-25 17:27:18 -0800
commit80a755545d54c8e9fd801f0de3d015defd825659 (patch)
tree91005c6d92ef474f8f3ee22c9deb51cc5517ee87 /arch
parentbfc835b5716fd86b568d4f9b15be04c4f361082b (diff)
parentfb32c76d16aa40f3057f53273ac483a8e2468004 (diff)
downloadlinux-80a755545d54c8e9fd801f0de3d015defd825659.tar.gz
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')
-rw-r--r--arch/cris/arch-v32/drivers/sync_serial.c2
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 08a313fc224..f772068d9e7 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,
struct timespec *ts)
{
unsigned long flags;
- int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+ int dev = MINOR(file_inode(file)->i_rdev);
int avail;
struct sync_port *port;
unsigned char *start;