slove some conflict

Signed-off-by: shangfan <[email protected]>
sf1999817 · Apr 22, 2024 · 841dd62 · 841dd62
1 parent 81a6a3b
commit 841dd62
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/eBPF_Supermarket/Filesystem_Subsystem/fs_watcher/write.bpf.c b/eBPF_Supermarket/Filesystem_Subsystem/fs_watcher/write.bpf.c
@@ -62,7 +62,7 @@ int kprobe_vfs_write(struct pt_regs *ctx)
 
   if(!e)
     return 0;
-
+  //如果探测到的指针不为空
   if(fd_ptr){
     int fd = *fd_ptr;
     e->fd = fd;

diff --git a/eBPF_Supermarket/Filesystem_Subsystem/fs_watcher/write.c b/eBPF_Supermarket/Filesystem_Subsystem/fs_watcher/write.c
@@ -105,6 +105,5 @@ int main(int argc, char **argv)
 	/* Clean up */
 	ring_buffer__free(rb);
 	write_bpf__destroy(skel);
-
 	return err < 0 ? -err : 0;
 }
diff --git a/eBPF_Supermarket/Filesystem_Subsystem/fs_watcher/write.h b/eBPF_Supermarket/Filesystem_Subsystem/fs_watcher/write.h
@@ -1,11 +1,10 @@
 #ifndef __WRITE_H
 #define __WRITE_H
 
-
+//获取vfs_write各个参数信息
 struct fs_t {
     int fd;
     int pid;
-    //获取vfs_write各个参数信息
     size_t real_count;
     size_t count;
 };