commit 3eb0897df7b37614ac656ee0d8f96de2b2a2b9d6
author Brad Fitzpatrick <bradfitz@android.com> Thu Mar 17 16:50:58 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 17 16:50:58 2011 -0700
tree 75b2af2ab735d1dfbca9595e7a0d4e8f9965ec11
parent 9b53946d91f5da5889de2b5224e99a07069f4bbe
parent 648ebad883e7825353c841950dd7d78664c238e6

Merge "SocketClient: add optional reference counting"

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 8e08ef3..657797e 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -401,7 +401,7 @@
 service drm /system/bin/drmserver
     class main
     user drm
-    group inet system
+    group system inet
 
 service media /system/bin/mediaserver
     class main

sdcard/sdcard.c

diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 0b8f656..fd003a7 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -326,15 +326,9 @@
 
     fuse->all = &fuse->root;
 
+    memset(&fuse->root, 0, sizeof(fuse->root));
     fuse->root.nid = FUSE_ROOT_ID; /* 1 */
-    fuse->root.next = 0;
-    fuse->root.child = 0;
-    fuse->root.parent = 0;
-
-    fuse->root.all = 0;
     fuse->root.refcount = 2;
-
-    fuse->root.name = 0;
     rename_node(&fuse->root, path);
 }