Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 213c99ee authored by Sage Weil's avatar Sage Weil
Browse files

ceph: whitespace cleanup 



Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 40819f6f

fs/ceph/addr.c

+9 −5
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ static int ceph_readpages(struct file *file, struct address_space *mapping, 
			zero_user_segment(page, s, PAGE_CACHE_SIZE);

		}



		if (add_to_page_cache_lru(page, mapping, page->index, GFP_NOFS)) {

		if (add_to_page_cache_lru(page, mapping, page->index,

					  GFP_NOFS)) {

			page_cache_release(page);

			dout("readpages %p add_to_page_cache failed %p\n",

			     inode, page);
@@ -797,9 +798,12 @@ get_more_pages: 
			dout("%p will write page %p idx %lu\n",

			     inode, page, page->index);



			writeback_stat = atomic_long_inc_return(&client->writeback_count);

			if (writeback_stat > CONGESTION_ON_THRESH(client->mount_args->congestion_kb)) {

				set_bdi_congested(&client->backing_dev_info, BLK_RW_ASYNC);

			writeback_stat =

			       atomic_long_inc_return(&client->writeback_count);

			if (writeback_stat > CONGESTION_ON_THRESH(

				    client->mount_args->congestion_kb)) {

				set_bdi_congested(&client->backing_dev_info,

						  BLK_RW_ASYNC);

			}



			set_page_writeback(page);

fs/ceph/debugfs.c

+9 −8
Original line number Diff line number Diff line
@@ -432,7 +432,8 @@ int ceph_debugfs_client_init(struct ceph_client *client) 
	if (!client->debugfs_caps)

		goto out;



	client->debugfs_congestion_kb = debugfs_create_file("writeback_congestion_kb",

	client->debugfs_congestion_kb =

		debugfs_create_file("writeback_congestion_kb",

				    0600,

				    client->debugfs_dir,

				    client,
@@ -466,7 +467,7 @@ void ceph_debugfs_client_cleanup(struct ceph_client *client) 
	debugfs_remove(client->debugfs_dir);

}



#else  // CONFIG_DEBUG_FS

#else  /* CONFIG_DEBUG_FS */



int __init ceph_debugfs_init(void)

{
@@ -486,4 +487,4 @@ void ceph_debugfs_client_cleanup(struct ceph_client *client) 
{

}



#endif  // CONFIG_DEBUG_FS
 
#endif  /* CONFIG_DEBUG_FS */

fs/ceph/mds_client.c

+3 −2
Original line number Diff line number Diff line
@@ -1985,8 +1985,9 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) 
	 */

	if (result == -ESTALE) {

		dout("got ESTALE on request %llu", req->r_tid);

		if (!req->r_inode) ; //do nothing; not an authority problem

		else if (req->r_direct_mode != USE_AUTH_MDS) {

		if (!req->r_inode) {

			/* do nothing; not an authority problem */

		} else if (req->r_direct_mode != USE_AUTH_MDS) {

			dout("not using auth, setting for that now");

			req->r_direct_mode = USE_AUTH_MDS;

			__do_request(mdsc, req);

fs/ceph/messenger.c

+5 −4
Original line number Diff line number Diff line
@@ -1302,8 +1302,8 @@ static void process_ack(struct ceph_connection *con) 




static int read_partial_message_section(struct ceph_connection *con,

					struct kvec *section, unsigned int sec_len,

					u32 *crc)

					struct kvec *section,

					unsigned int sec_len, u32 *crc)

{

	int left;

	int ret;
@@ -1434,7 +1434,8 @@ static int read_partial_message(struct ceph_connection *con) 


	/* middle */

	if (m->middle) {

		ret = read_partial_message_section(con, &m->middle->vec, middle_len,

		ret = read_partial_message_section(con, &m->middle->vec,

						   middle_len,

						   &con->in_middle_crc);

		if (ret <= 0)

			return ret;

fs/ceph/osd_client.c

+3 −3

File changed.

Contains only whitespace changes.

fs/ceph/osdmap.c

+1 −1

File changed.

Contains only whitespace changes.

fs/ceph/file.c

+1 −1

File changed.

Contains only whitespace changes.