Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (a1703154) · Commits · 戴 / test

drivers/block/rbd.c

+15 −4

Original line number	Diff line number	Diff line
		@@ -1790,18 +1790,29 @@ static ssize_t rbd_add(struct bus_type bus, const char buf, size_t count)

		rc = rbd_bus_add_dev(rbd_dev);
		if (rc)
		goto err_out_disk;
		goto err_out_blkdev;

		/* set up and announce blkdev mapping */
		rc = rbd_init_disk(rbd_dev);
		if (rc)
		goto err_out_blkdev;
		goto err_out_bus;

		return count;

		err_out_bus:
		mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
		list_del_init(&rbd_dev->node);
		mutex_unlock(&ctl_mutex);

		/* this will also clean up rest of rbd_dev stuff */

		rbd_bus_del_dev(rbd_dev);
		kfree(options);
		kfree(mon_dev_name);
		return rc;

		err_out_blkdev:
		unregister_blkdev(rbd_dev->major, rbd_dev->name);
		err_out_disk:
		rbd_free_disk(rbd_dev);
		err_out_client:
		rbd_put_client(rbd_dev);
		mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);

+1 −22

Original line number	Diff line number	Diff line
		@@ -2,31 +2,10 @@
		# Makefile for CEPH filesystem.
		#

		ifneq ($(KERNELRELEASE),)

		obj-$(CONFIG_CEPH_FS) += ceph.o

		ceph-objs := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \
		ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \
		export.o caps.o snap.o xattr.o \
		mds_client.o mdsmap.o strings.o ceph_frag.o \
		debugfs.o

		else
		#Otherwise we were called directly from the command
		# line; invoke the kernel build system.

		KERNELDIR ?= /lib/modules/$(shell uname -r)/build
		PWD := $(shell pwd)

		default: all

		all:
		$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules

		modules_install:
		$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules_install

		clean:
		$(MAKE) -C $(KERNELDIR) M=$(PWD) clean

		endif

+6 −3

Original line number	Diff line number	Diff line
		@@ -60,10 +60,13 @@ static int mdsc_show(struct seq_file s, void p)
		for (rp = rb_first(&mdsc->request_tree); rp; rp = rb_next(rp)) {
		req = rb_entry(rp, struct ceph_mds_request, r_node);

		if (req->r_request)
		seq_printf(s, "%lld\tmds%d\t", req->r_tid, req->r_mds);
		else
		if (req->r_request && req->r_session)
		seq_printf(s, "%lld\tmds%d\t", req->r_tid,
		req->r_session->s_mds);
		else if (!req->r_request)
		seq_printf(s, "%lld\t(no request)\t", req->r_tid);
		else
		seq_printf(s, "%lld\t(no session)\t", req->r_tid);

		seq_printf(s, "%s", ceph_mds_op_name(req->r_op));

+20 −0

Original line number	Diff line number	Diff line
		@@ -1224,6 +1224,26 @@ void ceph_dentry_lru_del(struct dentry *dn)
		}
		}

		/*
		* Return name hash for a given dentry. This is dependent on
		* the parent directory's hash function.
		*/
		unsigned ceph_dentry_hash(struct dentry *dn)
		{
		struct inode *dir = dn->d_parent->d_inode;
		struct ceph_inode_info *dci = ceph_inode(dir);

		switch (dci->i_dir_layout.dl_dir_hash) {
		case 0: /* for backward compat */
		case CEPH_STR_HASH_LINUX:
		return dn->d_name.hash;

		default:
		return ceph_str_hash(dci->i_dir_layout.dl_dir_hash,
		dn->d_name.name, dn->d_name.len);
		}
		}

		const struct file_operations ceph_dir_fops = {
		.read = ceph_read_dir,
		.readdir = ceph_readdir,

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ static int ceph_encode_fh(struct dentry dentry, u32 rawfh, int *max_len,
		dout("encode_fh %p connectable\n", dentry);
		cfh->ino = ceph_ino(dentry->d_inode);
		cfh->parent_ino = ceph_ino(parent->d_inode);
		cfh->parent_name_hash = parent->d_name.hash;
		cfh->parent_name_hash = ceph_dentry_hash(parent);
		*max_len = connected_handle_length;
		type = 2;
		} else if (*max_len >= handle_length) {