From bd5319bac83fe81954b27e956e1e5e3a958a946e Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 18 May 2009 13:21:58 -0700
Subject: [PATCH] kclient: strip trailing whitespace

---
 src/kernel/caps.c       | 18 +++++++++---------
 src/kernel/debugfs.c    |  4 ++--
 src/kernel/dir.c        |  2 +-
 src/kernel/file.c       |  6 +++---
 src/kernel/inode.c      | 16 ++++++++--------
 src/kernel/mds_client.c |  4 ++--
 src/kernel/mds_client.h |  2 +-
 src/kernel/messenger.c  |  4 ++--
 src/kernel/mon_client.h |  4 ++--
 src/kernel/snap.c       |  4 ++--
 src/kernel/super.c      |  4 ++--
 src/kernel/super.h      |  2 +-
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/kernel/caps.c b/src/kernel/caps.c
index 72c95c7b0099c..c525c64c911bb 100644
--- a/src/kernel/caps.c
+++ b/src/kernel/caps.c
@@ -86,7 +86,7 @@ const char *ceph_cap_string(int caps)
 		*s++ = 'F';
 		s = gcap_string(s, c);
 	}
-	
+
 	if (s == cap_str[i])
 		*s++ = '-';
 	*s = 0;
@@ -109,7 +109,7 @@ void ceph_caps_finalize(void)
 {
 	struct ceph_cap *cap;
 	spin_lock(&caps_list_lock);
-        while (!list_empty(&caps_list)) {
+	while (!list_empty(&caps_list)) {
 		cap = list_first_entry(&caps_list, struct ceph_cap, caps_item);
 		list_del(&cap->caps_item);
 		kmem_cache_free(ceph_cap_cachep, cap);
@@ -640,7 +640,7 @@ int __ceph_caps_mds_wanted(struct ceph_inode_info *ci)
 			continue;
 		mds_wanted |= cap->mds_wanted;
 	}
-	return mds_wanted;	
+	return mds_wanted;
 }
 
 /*
@@ -1761,10 +1761,10 @@ start:
 		inode->i_mode = le32_to_cpu(grant->mode);
 		inode->i_uid = le32_to_cpu(grant->uid);
 		inode->i_gid = le32_to_cpu(grant->gid);
-		dout(20, "%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode, 
+		dout(20, "%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode,
 		     inode->i_uid, inode->i_gid);
 	}
-	
+
 	if ((issued & CEPH_CAP_LINK_EXCL) == 0) {
 		inode->i_nlink = le32_to_cpu(grant->nlink);
 	}
@@ -1993,7 +1993,7 @@ static void handle_cap_trunc(struct inode *inode,
 	int dirty = __ceph_caps_dirty(ci);
 	int issued = __ceph_caps_issued(ceph_inode(inode), &implemented);
 	int queue_trunc = 0;
-	
+
 	issued |= implemented | dirty;
 
 	dout(10, "handle_cap_trunc inode %p mds%d seq %d to %lld seq %d\n",
@@ -2064,7 +2064,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex,
  *
  * caller holds s_mutex.
  */
-static void handle_cap_import(struct ceph_mds_client *mdsc, 
+static void handle_cap_import(struct ceph_mds_client *mdsc,
 			      struct inode *inode, struct ceph_mds_caps *im,
 			      struct ceph_mds_session *session,
 			      void *snaptrace, int snaptrace_len)
@@ -2092,7 +2092,7 @@ static void handle_cap_import(struct ceph_mds_client *mdsc,
 		dout(10, "handle_cap_import inode %p ci %p mds%d mseq %d\n",
 		     inode, ci, mds, mseq);
 	}
-	
+
 	down_write(&mdsc->snap_rwsem);
 	ceph_update_snap_trace(mdsc, snaptrace, snaptrace+snaptrace_len,
 			       false);
@@ -2196,7 +2196,7 @@ void ceph_handle_caps(struct ceph_mds_client *mdsc,
 		spin_unlock(&inode->i_lock);
 		goto done;
 	}
-	
+
 	/* note that each of these drops i_lock for us */
 	switch (op) {
 	case CEPH_CAP_OP_REVOKE:
diff --git a/src/kernel/debugfs.c b/src/kernel/debugfs.c
index ae2a6a25ca65a..715431c0caacf 100644
--- a/src/kernel/debugfs.c
+++ b/src/kernel/debugfs.c
@@ -436,13 +436,13 @@ static int debugfs_bookkeeper_set(void *data, u64 val)
 {
 	if (val)
 		ceph_bookkeeper_dump();
-        return 0;
+	return 0;
 }
 
 static int debugfs_bookkeeper_get(void *data, u64 *val)
 {
 	*val = 0;
-        return 0;
+	return 0;
 }
 
 DEFINE_SIMPLE_ATTRIBUTE(bookkeeper_fops, debugfs_bookkeeper_get, debugfs_bookkeeper_set, "%llu\n");
diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index 845f24e379582..60edfa935f065 100644
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -539,7 +539,7 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
 	req->r_args.mknod.mode = cpu_to_le32(mode);
 	req->r_args.mknod.rdev = cpu_to_le32(rdev);
 	req->r_dentry_drop = CEPH_CAP_FILE_SHARED;
-	req->r_dentry_unless = CEPH_CAP_FILE_EXCL; 
+	req->r_dentry_unless = CEPH_CAP_FILE_EXCL;
 	err = ceph_mdsc_do_request(mdsc, dir, req);
 	if (!err && !req->r_reply_info.head->is_dentry)
 		err = ceph_handle_notrace_create(dir, dentry);
diff --git a/src/kernel/file.c b/src/kernel/file.c
index 84d3bfa5b0194..82e5523891588 100644
--- a/src/kernel/file.c
+++ b/src/kernel/file.c
@@ -82,7 +82,7 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
 		BUG_ON(inode->i_fop->release == ceph_release);
 
 		/* call the proper open fop */
-		ret = inode->i_fop->open(inode, file);		
+		ret = inode->i_fop->open(inode, file);
 	}
 	return ret;
 }
@@ -148,7 +148,7 @@ int ceph_open(struct inode *inode, struct file *file)
 		     ceph_cap_string(issued));
 		__ceph_get_fmode(ci, fmode);
 		spin_unlock(&inode->i_lock);
-		
+
 		/* adjust wanted? */
 		if ((issued & wanted) != wanted &&
 		    (mds_wanted & wanted) != wanted &&
@@ -223,7 +223,7 @@ struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
 	err = ceph_mdsc_do_request(mdsc, parent_inode, req);
 	dentry = ceph_finish_lookup(req, dentry, err);
 	if (!err && (flags & O_CREAT) && !req->r_reply_info.head->is_dentry)
-		err = ceph_handle_notrace_create(dir, dentry);	
+		err = ceph_handle_notrace_create(dir, dentry);
 	if (!err)
 		err = ceph_init_file(req->r_dentry->d_inode, file,
 				     req->r_fmode);
diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 1a626e2c376bf..406cb100c82f9 100644
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -509,7 +509,7 @@ static int fill_inode(struct inode *inode,
 		inode->i_mode = le32_to_cpu(info->mode);
 		inode->i_uid = le32_to_cpu(info->uid);
 		inode->i_gid = le32_to_cpu(info->gid);
-		dout(20, "%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode, 
+		dout(20, "%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode,
 		     inode->i_uid, inode->i_gid);
 	}
 
@@ -714,8 +714,8 @@ static void update_dentry_lease(struct dentry *dentry,
 
 	/* only track leases on regular dentries */
 	if (dentry->d_op != &ceph_dentry_ops)
-		return;	
-	
+		return;
+
 	dout(10, "update_dentry_lease %p mask %d duration %lu ms ttl %lu\n",
 	     dentry, le16_to_cpu(lease->mask), duration, ttl);
 	if (lease->mask == 0) {
@@ -1936,13 +1936,13 @@ static int __get_required_blob_size(struct ceph_inode_info *ci, int name_size, i
 {
 	/*
 	 * 4 bytes for the length, and additional 4 bytes per each xattr name,
-         * 4 bytes per each value
+	 * 4 bytes per each value
 	 */
 	int size = 4 + ci->i_xattrs.count*(4 + 4) +
 			     ci->i_xattrs.names_size +
 			     ci->i_xattrs.vals_size;
 	dout(30, "__get_required_blob_size count=%d names.size=%d vals.size=%d\n", ci->i_xattrs.count, ci->i_xattrs.names_size,
-                             ci->i_xattrs.vals_size);
+	                     ci->i_xattrs.vals_size);
 
 	if (name_size)
 		size += 4 + 4 + name_size + val_size;
@@ -1980,7 +1980,7 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci,
 
 			p = rb_next(p);
 		}
-	
+
 		*xattrs_blob =  ci->i_xattrs.prealloc_blob;
 		*blob_size = ci->i_xattrs.prealloc_size;
 	} else {
@@ -2012,7 +2012,7 @@ ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,
 			ceph_cap_string(issued),
 			ci->i_xattrs.version, ci->i_xattrs.index_version);
 
-        if ((issued & CEPH_CAP_XATTR_SHARED) &&
+	if ((issued & CEPH_CAP_XATTR_SHARED) &&
 	    (ci->i_xattrs.index_version >= ci->i_xattrs.version)) {
 		goto get_xattr;
 	} else {
@@ -2069,7 +2069,7 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
 			ceph_cap_string(issued),
 			ci->i_xattrs.version, ci->i_xattrs.index_version);
 
-        if ((issued & CEPH_CAP_XATTR_SHARED) &&
+	if ((issued & CEPH_CAP_XATTR_SHARED) &&
 	    (ci->i_xattrs.index_version > ci->i_xattrs.version)) {
 		goto list_xattr;
 	} else {
diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 30eaa63736a56..7c44c44c2dd23 100644
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -1156,7 +1156,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
 	/* cap releases */
 	releases = 0;
 	if (req->r_inode_drop)
-		releases += ceph_encode_inode_release(&p, 
+		releases += ceph_encode_inode_release(&p,
 		      req->r_inode ? req->r_inode : req->r_dentry->d_inode,
 		      mds, req->r_inode_drop, req->r_inode_unless);
 	if (req->r_dentry_drop)
@@ -1537,7 +1537,7 @@ void ceph_mdsc_handle_reply(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
 	dout(10, "handle_reply tid %lld result %d\n", tid, result);
 
 	/*
-	 * Tolerate 2 consecutive ESTALEs from the same mds. 
+	 * Tolerate 2 consecutive ESTALEs from the same mds.
 	 * FIXME: we should be looking at the cap migrate_seq.
 	 */
 	if (result == -ESTALE) {
diff --git a/src/kernel/mds_client.h b/src/kernel/mds_client.h
index a4a03eb284b0b..7be231087afb3 100644
--- a/src/kernel/mds_client.h
+++ b/src/kernel/mds_client.h
@@ -176,7 +176,7 @@ struct ceph_mds_request {
 	int r_old_dentry_drop, r_old_dentry_unless;
 	struct inode *r_old_inode;
 	int r_old_inode_drop, r_old_inode_unless;
-	
+
 	struct inode *r_target_inode;
 
 	struct ceph_msg  *r_request;  /* original request */
diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index af83d0599f117..a541e59d5379f 100644
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -1423,7 +1423,7 @@ static int read_partial_message(struct ceph_connection *con)
 	struct ceph_client *client = con->msgr->parent;
 	int datacrc = !ceph_test_opt(client, NOCRC);
 
-	dout(20, "read_partial_message con %p msg %p\n", con, m);	
+	dout(20, "read_partial_message con %p msg %p\n", con, m);
 
 	/* header */
 	while (con->in_base_pos < sizeof(m->hdr)) {
@@ -1573,7 +1573,7 @@ no_data:
 			p = kmap(m->pages[cur_page]);
 			printk("data page %d len %d\n", cur_page, left);
 			print_section("data", p, left);
-					  
+
 			kunmap(m->pages[0]);
 			mutex_unlock(&m->page_mutex);
 		}
diff --git a/src/kernel/mon_client.h b/src/kernel/mon_client.h
index 4550e6cf39999..354682286c361 100644
--- a/src/kernel/mon_client.h
+++ b/src/kernel/mon_client.h
@@ -70,8 +70,8 @@ struct ceph_mon_request {
 /* statfs() is done a bit differently */
 struct ceph_mon_statfs_request {
 	u64 tid;
-        struct kobject kobj;
-        struct ceph_mon_statfs_request_attr k_op, k_mon;
+	struct kobject kobj;
+	struct ceph_mon_statfs_request_attr k_op, k_mon;
 	int result;
 	struct ceph_statfs *buf;
 	struct completion completion;
diff --git a/src/kernel/snap.c b/src/kernel/snap.c
index d2847d5c88266..b1680cd85cf08 100644
--- a/src/kernel/snap.c
+++ b/src/kernel/snap.c
@@ -137,12 +137,12 @@ static void __destroy_snap_realm(struct ceph_mds_client *mdsc,
 	dout(10, "__destroy_snap_realm %p %llx\n", realm, realm->ino);
 
 	radix_tree_delete(&mdsc->snap_realms, realm->ino);
-	
+
 	if (realm->parent) {
 		list_del_init(&realm->child_item);
 		__put_snap_realm(mdsc, realm->parent);
 	}
-	
+
 	kfree(realm->prior_parent_snaps);
 	kfree(realm->snaps);
 	ceph_put_snap_context(realm->cached_context);
diff --git a/src/kernel/super.c b/src/kernel/super.c
index ca49dd52f582e..c59cac1fd533d 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -876,7 +876,7 @@ static int ceph_mount(struct ceph_client *client, struct vfsmount *mnt,
 		}
 	}
 
-	
+
 	dout(30, "mount opening root\n");
 	root = open_root_dentry(client, "", started);
 	if (IS_ERR(root)) {
@@ -900,7 +900,7 @@ static int ceph_mount(struct ceph_client *client, struct vfsmount *mnt,
 			goto out;
 		}
 	}
-		
+
 	mnt->mnt_root = root;
 	mnt->mnt_sb = client->sb;
 
diff --git a/src/kernel/super.h b/src/kernel/super.h
index ec16b138168f8..cf1b67abdd1f0 100644
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -194,7 +194,7 @@ struct ceph_cap_snap {
 	u64 follows;
 	int issued, dirty;
 	struct ceph_snap_context *context;
-	
+
 	mode_t mode;
 	uid_t uid;
 	gid_t gid;
-- 
2.39.5