From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 19:42:30 +0000 (-0700)
Subject: Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~36^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=818eafca5ba5cd23bbb6438512c8094321f61d04;p=zfs

Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
---

818eafca5ba5cd23bbb6438512c8094321f61d04
diff --cc lib/libzpool/kernel.c
index 7f6c37da0,fc2a87fdb..db5d6350e
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@@ -322,9 -323,8 +322,9 @@@ vn_open(char *path, int x1, int flags, 
  	int fd;
  	vnode_t *vp;
  	int old_umask;
- 	char real_path[MAXPATHLEN];
+ 	char realpath[MAXPATHLEN];
  	struct stat64 st;
 +	int err;
  
  	/*
  	 * If we're accessing a real disk from userland, we need to use