X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=kernel%2Frelay.c;h=01ab081ac53a78a54b0f61004e09fe8a738f8733;hb=092bc089c249de0fa0f0c98b28dea6e5f1367b6e;hp=e8cd2027abbd1e2e0ed6d432974816cef2845a42;hpb=51b743fe87d7fb3dba7a2ff4a1fe23bb65dc2245;p=deliverable%2Flinux.git diff --git a/kernel/relay.c b/kernel/relay.c index e8cd2027abbd..01ab081ac53a 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -1139,7 +1139,7 @@ static ssize_t relay_file_read_subbufs(struct file *filp, loff_t *ppos, if (!desc->count) return 0; - mutex_lock(&filp->f_path.dentry->d_inode->i_mutex); + mutex_lock(&file_inode(filp)->i_mutex); do { if (!relay_file_read_avail(buf, *ppos)) break; @@ -1159,7 +1159,7 @@ static ssize_t relay_file_read_subbufs(struct file *filp, loff_t *ppos, *ppos = relay_file_read_end_pos(buf, read_start, ret); } } while (desc->count && ret); - mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex); + mutex_unlock(&file_inode(filp)->i_mutex); return desc->written; }