svn commit: r279550 - projects/zfsd/head/cddl/sbin/zfsd

[Xin LI]

Author: delphij
Date: Mon Mar  2 22:03:13 2015
New Revision: 279550
URL: https://svnweb.freebsd.org/changeset/base/279550

Log:
  Space cleanups.  No actual code change.

Modified:
  projects/zfsd/head/cddl/sbin/zfsd/case_file.cc
  projects/zfsd/head/cddl/sbin/zfsd/vdev.h
  projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc
  projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc
  projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h

Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc	Mon Mar  2 21:41:09 2015	(r279549)
+++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc	Mon Mar  2 22:03:13 2015	(r279550)
@@ -92,7 +92,7 @@ using DevCtl::ParseException;
 /*-------------------------- File-scoped classes ----------------------------*/
 /**
  * \brief Functor that operators on STL collections of CaseFiles
- * 
+ *
  * Selectively calls ReEvaluate on the casefile, based on its pool GUID.
  */
 class CaseFileReEvaluator : public std::unary_function<CaseFile, bool>
@@ -403,7 +403,7 @@ CaseFile::ReEvaluate(const ZfsEvent &eve
 			       "unconfigured.  Closing\n",
 			       PoolGUIDString().c_str(),
 			       VdevGUIDString().c_str());
-			/* 
+			/*
 			 * Close the case now so we won't waste cycles in the
 			 * system rescan
 			 */
@@ -1108,14 +1108,14 @@ bool
 CaseFile::ShouldDegrade() const
 {
 	return (std::count_if(m_events.begin(), m_events.end(),
-	    		      IsChecksumEvent) > ZFS_DEGRADE_IO_COUNT);
+			      IsChecksumEvent) > ZFS_DEGRADE_IO_COUNT);
 }
 
 bool
 CaseFile::ShouldFault() const
 {
 	return (std::count_if(m_events.begin(), m_events.end(),
-	    		      IsIOEvent) > ZFS_DEGRADE_IO_COUNT);
+			      IsIOEvent) > ZFS_DEGRADE_IO_COUNT);
 }
 
 nvlist_t *

Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.h
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/vdev.h	Mon Mar  2 21:41:09 2015	(r279549)
+++ projects/zfsd/head/cddl/sbin/zfsd/vdev.h	Mon Mar  2 22:03:13 2015	(r279550)
@@ -119,7 +119,7 @@ public:
 	bool			 IsSpare()	const;
 	virtual DevCtl::Guid	 PoolGUID()	const;
 	virtual vdev_state	 State()	const;
-	std::string	 	 Path()		const;
+	std::string		 Path()		const;
 	virtual std::string	 PhysicalPath()	const;
 	std::string		 GUIDString()	const;
 	nvlist_t		*PoolConfig()	const;
@@ -137,8 +137,8 @@ private:
 	bool			 VdevLookupPoolGuid();
 	DevCtl::Guid		 m_poolGUID;
 	DevCtl::Guid		 m_vdevGUID;
-	nvlist_t    		*m_poolConfig;
-	nvlist_t    		*m_config;
+	nvlist_t		*m_poolConfig;
+	nvlist_t		*m_config;
 };
 
 //- Special objects -----------------------------------------------------------

Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc	Mon Mar  2 21:41:09 2015	(r279549)
+++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc	Mon Mar  2 22:03:13 2015	(r279550)
@@ -227,7 +227,7 @@ ZfsDaemon::RescanSystem()
 {
         struct gmesh	  mesh;
         struct gclass	 *mp;
-        struct ggeom 	 *gp;
+        struct ggeom	 *gp;
         struct gprovider *pp;
 	int		  result;
 

Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc	Mon Mar  2 21:41:09 2015	(r279549)
+++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc	Mon Mar  2 22:03:13 2015	(r279550)
@@ -154,7 +154,7 @@ DevfsEvent::DeepCopy() const
 {
 	return (new DevfsEvent(*this));
 }
- 
+
 bool
 DevfsEvent::Process() const
 {
@@ -194,7 +194,7 @@ DevfsEvent::Process() const
 		       "as a replace by physical path candidate.\n",
 		       devName.c_str());
 	} else if (havePhysPath && IsWholeDev()) {
-		/* 
+		/*
 		 * TODO: attempt to resolve events using every casefile
 		 * that matches this physpath
 		 */
@@ -395,7 +395,7 @@ ZfsEvent::ProcessPoolEvent() const
 	}
 	else if (Value("type") == "misc.fs.zfs.resilver_finish")
 	{
-		/* 
+		/*
 		 * It's possible to get a resilver_finish event with no
 		 * corresponding casefile.  For example, if a damaged pool were
 		 * exported, repaired, then reimported.

Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h	Mon Mar  2 21:41:09 2015	(r279549)
+++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h	Mon Mar  2 22:03:13 2015	(r279550)
@@ -68,7 +68,7 @@ public:
 	/** Specialized DevCtlEvent object factory for Devfs events. */
 	static BuildMethod Builder;
 
-	virtual DevCtl::Event *DeepCopy() const; 
+	virtual DevCtl::Event *DeepCopy() const;
 
 	/**
 	 * Interpret and perform any actions necessary to
@@ -140,7 +140,7 @@ protected:
 	/** Constructor */
 	ZfsEvent(Type, DevCtl::NVPairMap &, const string &);
 
-	/** 
+	/**
 	 * Detach any spares that are no longer needed, but were not
 	 * automatically detached by the kernel
 	 */