msm8960: get all the needed changes for kernelo8.0

Merge branch 'lineage-15.0' of https://github.com/tathanhlam66/android_kernel_htc_msm8960 into o8.0

Change-Id: Ib0698d0a99afbfe73e1bfccddcfb29df5d085045

1 files changed, 4 insertions, 4 deletions

diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index 33a21260b79..fd1a840f565 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -122,7 +122,7 @@ struct sock *unix_get_socket(struct file *filp)
  *	descriptor if it is for an AF_UNIX socket.
  */
 
-void unix_inflight(struct user_struct *user, struct file *fp)
+void unix_inflight(struct file *fp)
 {
 	struct sock *s = unix_get_socket(fp);
 
@@ -138,11 +138,11 @@ void unix_inflight(struct user_struct *user, struct file *fp)
 		}
 		unix_tot_inflight++;
 	}
-	user->unix_inflight++;
+	fp->f_cred->user->unix_inflight++;
 	spin_unlock(&unix_gc_lock);
 }
 
-void unix_notinflight(struct user_struct *user, struct file *fp)
+void unix_notinflight(struct file *fp)
 {
 	struct sock *s = unix_get_socket(fp);
 
@@ -155,7 +155,7 @@ void unix_notinflight(struct user_struct *user, struct file *fp)
 			list_del_init(&u->link);
 		unix_tot_inflight--;
 	}
-	user->unix_inflight--;
+	fp->f_cred->user->unix_inflight--;
 	spin_unlock(&unix_gc_lock);
 }