Add PID to fuse_context

diff --git a/ChangeLog b/ChangeLog
index fced7dacb1835dba3a61eaf5cc232dd392997d66..ff0ab3e335456ac5cd963ba3e8aff1c4aa29884e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-27  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Add PID to fuse_context.  Patch by Steven James
+
 2004-09-22  Miklos Szeredi <miklos@szeredi.hu>
 
        * A slight API change: fuse_get_context() doesn't need the "fuse"

diff --git a/include/fuse.h b/include/fuse.h
index 22de11b82c68793c5d3d21fddbeadef4c05aaa1c..3c68a8e2ae74b7eec3e628e9bfc50b3111f38e1d 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -136,6 +136,7 @@ struct fuse_context {
     struct fuse *fuse;
     uid_t uid;
     gid_t gid;
+    pid_t pid;
 };
 
 #ifdef __cplusplus

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 77ad8d647e388932b47e7d53bc6c3cd45f20b072..4dfd61bd9e1c0393e37e3bf6320ec8aeeee89dbe 100644 (file)
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -201,6 +201,7 @@ struct fuse_in_header {
        unsigned long ino;
        unsigned int uid;
        unsigned int gid;
+       unsigned int pid;
 };
 
 struct fuse_out_header {

diff --git a/kernel/dev.c b/kernel/dev.c
index ff3ed92d055e83a9300e79a9d3930b050c755f10..ac856cba1db9c6bce2032bbfa02685bf97c56d50 100644 (file)
--- a/kernel/dev.c
+++ b/kernel/dev.c
@@ -134,6 +134,7 @@ struct fuse_req *fuse_get_request(struct fuse_conn *fc)
        req = do_get_request(fc);
        req->in.h.uid = current->fsuid;
        req->in.h.gid = current->fsgid;
+       req->in.h.pid = current->pid;
        return req;
 }
 

diff --git a/lib/fuse.c b/lib/fuse.c
index fae68a1202e2610cdc2d5690d566dd2190b3246d..1a3f4d069004f40af8a470475120f5872364b1ae 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -1444,6 +1444,7 @@ void __fuse_process_cmd(struct fuse *f, struct fuse_cmd *cmd)
     ctx->fuse = f;
     ctx->uid = in->uid;
     ctx->gid = in->gid;
+    ctx->pid = in->pid;
     
     argsize = cmd->buflen - sizeof(struct fuse_in_header);