X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=fs%2Ffuse%2Ffile.c;h=0273029b1220ce3aca8f389e909e29a2214dc233;hb=066dea8c30ae7d8e061145bcf5422ce0773582eb;hp=ab60051be6e533eb167a72e590494f0a46e3a488;hpb=f57091767add2b79d76aac41b83b192d8ba1dce7;p=platform%2Fkernel%2Flinux-exynos.git

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index ab60051..0273029 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2102,11 +2102,11 @@ static int convert_fuse_file_lock(struct fuse_conn *fc,
 		fl->fl_end = ffl->end;
 
 		/*
-		 * Convert pid into the caller's pid namespace. If the pid
-		 * does not map into the namespace fl_pid will get set to 0.
+		 * Convert pid into init's pid namespace.  The locks API will
+		 * translate it into the caller's pid namespace.
 		 */
 		rcu_read_lock();
-		fl->fl_pid = pid_vnr(find_pid_ns(ffl->pid, fc->pid_ns));
+		fl->fl_pid = pid_nr_ns(find_pid_ns(ffl->pid, fc->pid_ns), &init_pid_ns);
 		rcu_read_unlock();
 		break;