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

Commit 56b59b42 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 

Pull Ceph updates for 3.4-rc1 from Sage Weil:
 "Alex has been busy.  There are a range of rbd and libceph cleanups,
  especially surrounding device setup and teardown, and a few critical
  fixes in that code.  There are more cleanups in the messenger code,
  virtual xattrs, a fix for CRC calculation/checks, and lots of other
  miscellaneous stuff.

  There's a patch from Amon Ott to make inos behave a bit better on
  32-bit boxes, some decode check fixes from Xi Wang, and network
  throttling fix from Jim Schutt, and a couple RBD fixes from Josh
  Durgin.

  No new functionality, just a lot of cleanup and bug fixing."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (65 commits)
  rbd: move snap_rwsem to the device, rename to header_rwsem
  ceph: fix three bugs, two in ceph_vxattrcb_file_layout()
  libceph: isolate kmap() call in write_partial_msg_pages()
  libceph: rename "page_shift" variable to something sensible
  libceph: get rid of zero_page_address
  libceph: only call kernel_sendpage() via helper
  libceph: use kernel_sendpage() for sending zeroes
  libceph: fix inverted crc option logic
  libceph: some simple changes
  libceph: small refactor in write_partial_kvec()
  libceph: do crc calculations outside loop
  libceph: separate CRC calculation from byte swapping
  libceph: use "do" in CRC-related Boolean variables
  ceph: ensure Boolean options support both senses
  libceph: a few small changes
  libceph: make ceph_tcp_connect() return int
  libceph: encapsulate some messenger cleanup code
  libceph: make ceph_msgr_wq private
  libceph: encapsulate connection kvec operations
  libceph: move prepare_write_banner()
  ...
parents 9a7259d5 c666601a

drivers/block/rbd.c

+448 −282

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/rbd_types.h

+0 −4
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ 
#define RBD_HEADER_SIGNATURE	"RBD"

#define RBD_HEADER_VERSION	"001.005"



struct rbd_info {

	__le64 max_id;

} __attribute__ ((packed));



struct rbd_image_snap_ondisk {

	__le64 id;

	__le64 image_size;

fs/ceph/inode.c

+6 −5
Original line number Diff line number Diff line
@@ -677,18 +677,19 @@ static int fill_inode(struct inode *inode, 
	case S_IFLNK:

		inode->i_op = &ceph_symlink_iops;

		if (!ci->i_symlink) {

			int symlen = iinfo->symlink_len;

			u32 symlen = iinfo->symlink_len;

			char *sym;



			BUG_ON(symlen != inode->i_size);

			spin_unlock(&ci->i_ceph_lock);



			err = -EINVAL;

			if (WARN_ON(symlen != inode->i_size))

				goto out;



			err = -ENOMEM;

			sym = kmalloc(symlen+1, GFP_NOFS);

			sym = kstrndup(iinfo->symlink, symlen, GFP_NOFS);

			if (!sym)

				goto out;

			memcpy(sym, iinfo->symlink, symlen);

			sym[symlen] = 0;



			spin_lock(&ci->i_ceph_lock);

			if (!ci->i_symlink)

fs/ceph/mds_client.c

+3 −4
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, 


	spin_lock_init(&s->s_gen_ttl_lock);

	s->s_cap_gen = 0;

	s->s_cap_ttl = 0;

	s->s_cap_ttl = jiffies - 1;



	spin_lock_init(&s->s_cap_lock);

	s->s_renew_requested = 0;
@@ -1083,8 +1083,7 @@ static void renewed_caps(struct ceph_mds_client *mdsc, 
	int wake = 0;



	spin_lock(&session->s_cap_lock);

	was_stale = is_renew && (session->s_cap_ttl == 0 ||

				 time_after_eq(jiffies, session->s_cap_ttl));

	was_stale = is_renew && time_after_eq(jiffies, session->s_cap_ttl);



	session->s_cap_ttl = session->s_renew_requested +

		mdsc->mdsmap->m_session_timeout*HZ;
@@ -2332,7 +2331,7 @@ static void handle_session(struct ceph_mds_session *session, 
			session->s_mds);

		spin_lock(&session->s_gen_ttl_lock);

		session->s_cap_gen++;

		session->s_cap_ttl = 0;

		session->s_cap_ttl = jiffies - 1;

		spin_unlock(&session->s_gen_ttl_lock);

		send_renew_caps(mdsc, session);

		break;

fs/ceph/snap.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int build_snap_context(struct ceph_snap_realm *realm) 


	/* alloc new snap context */

	err = -ENOMEM;

	if (num > ULONG_MAX / sizeof(u64) - sizeof(*snapc))

	if (num > (ULONG_MAX - sizeof(*snapc)) / sizeof(u64))

		goto fail;

	snapc = kzalloc(sizeof(*snapc) + num*sizeof(u64), GFP_NOFS);

	if (!snapc)