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

Commit 682c30ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (39 commits)
  ceph: generalize mon requests, add pool op support
  ceph: only queue async writeback on cap revocation if there is dirty data
  ceph: do not ignore osd_idle_ttl mount option
  ceph: constify dentry_operations
  ceph: whitespace cleanup
  ceph: add flock/fcntl lock support
  ceph: define on-wire types, constants for file locking support
  ceph: add CEPH_FEATURE_FLOCK to the supported feature bits
  ceph: support v2 reconnect encoding
  ceph: support v2 client_caps encoding
  ceph: move AES iv definition to shared header
  ceph: fix decoding of pool snap info
  ceph: make ->sync_fs not wait if wait==0
  ceph: warn on missing snap realm
  ceph: print useful error message when crush rule not found
  ceph: use %pU to print uuid (fsid)
  ceph: sync header defs with server code
  ceph: clean up header guards
  ceph: strip misleading/obsolete version, feature info
  ceph: specify supported features in super.h
  ...
parents 84479f3c e56fa10e

fs/ceph/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ifneq ($(KERNELRELEASE),) 


obj-$(CONFIG_CEPH_FS) += ceph.o



ceph-objs := super.o inode.o dir.o file.o addr.o ioctl.o \

ceph-objs := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \

	export.o caps.o snap.o xattr.o \

	messenger.o msgpool.o buffer.o pagelist.o \

	mds_client.o mdsmap.o \

fs/ceph/addr.c

+10 −6
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);
@@ -552,7 +553,7 @@ static void writepages_finish(struct ceph_osd_request *req, 
		 * page truncation thread, possibly losing some data that

		 * raced its way in

		 */

		if ((issued & CEPH_CAP_FILE_CACHE) == 0)

		if ((issued & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) == 0)

			generic_error_remove_page(inode->i_mapping, page);



		unlock_page(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/armor.c

+5 −1
Original line number Diff line number Diff line 


#include <linux/errno.h>



int ceph_armor(char *dst, const char *src, const char *end);

int ceph_unarmor(char *dst, const char *src, const char *end);



/*

 * base64 encode/decode.

 */



const char *pem_key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

static const char *pem_key =

	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";



static int encode_bits(int c)

{

fs/ceph/auth.c

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static u32 supported_protocols[] = { 
	CEPH_AUTH_CEPHX

};



int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol)

static int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol)

{

	switch (protocol) {

	case CEPH_AUTH_NONE:
@@ -133,7 +133,7 @@ bad: 
	return -ERANGE;

}



int ceph_build_auth_request(struct ceph_auth_client *ac,

static int ceph_build_auth_request(struct ceph_auth_client *ac,

				   void *msg_buf, size_t msg_len)

{

	struct ceph_mon_request_header *monhdr = msg_buf;

fs/ceph/auth_x.c

+3 −3
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ static int ceph_x_decrypt(struct ceph_crypto_key *secret, 
/*

 * get existing (or insert new) ticket handler

 */

struct ceph_x_ticket_handler *get_ticket_handler(struct ceph_auth_client *ac,

						 int service)

static struct ceph_x_ticket_handler *

get_ticket_handler(struct ceph_auth_client *ac, int service)

{

	struct ceph_x_ticket_handler *th;

	struct ceph_x_info *xi = ac->private;
@@ -429,7 +429,7 @@ static int ceph_x_build_request(struct ceph_auth_client *ac, 
		auth->struct_v = 1;

		auth->key = 0;

		for (u = (u64 *)tmp_enc; u + 1 <= (u64 *)(tmp_enc + ret); u++)

			auth->key ^= *u;

			auth->key ^= *(__le64 *)u;

		dout(" server_challenge %llx client_challenge %llx key %llx\n",

		     xi->server_challenge, le64_to_cpu(auth->client_challenge),

		     le64_to_cpu(auth->key));