summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmir Samuelov <amirs@codeaurora.org>2016-03-13 16:17:43 +0200
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:24:03 -0700
commita56866b4eb9939e5e82d56eef4f172c069768712 (patch)
treebccc3dd05f47e5fab1fd094c61beba1959e507e1
parent809d8460ca183ba21cf0a342bca0ca925a59eba7 (diff)
soc: qcom: fix spcom getting the file dentry
The struct file no longer has the f_dentry macro. The dentry is fetched from the f_path->dentry. Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
-rw-r--r--drivers/soc/qcom/spcom.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/soc/qcom/spcom.c b/drivers/soc/qcom/spcom.c
index cc90f18cdd58..a1180966b674 100644
--- a/drivers/soc/qcom/spcom.c
+++ b/drivers/soc/qcom/spcom.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -1846,10 +1846,10 @@ static char *file_to_filename(struct file *filp)
struct dentry *dentry = NULL;
char *filename = NULL;
- if (!filp || !filp->f_dentry)
+ if (!filp || !filp->f_path.dentry)
return "unknown";
- dentry = filp->f_dentry;
+ dentry = filp->f_path.dentry;
filename = dentry->d_iname;
return filename;