From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jun 2014 06:06:23 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6d87c225f5d82d29243dc124f1ffcbb0e14ec358;p=openwrt%2Fstaging%2Fblogic.git

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

Pull Ceph updates from Sage Weil:
 "This has a mix of bug fixes and cleanups.

  Alex's patch fixes a rare race in RBD.  Ilya's patches fix an ENOENT
  check when a second rbd image is mapped and a couple memory leaks.
  Zheng fixes several issues with fragmented directories and multiple
  MDSs.  Josh fixes a spin/sleep issue, and Josh and Guangliang's
  patches fix setting and unsetting RBD images read-only.

  Naturally there are several other cleanups mixed in for good measure"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (23 commits)
  rbd: only set disk to read-only once
  rbd: move calls that may sleep out of spin lock range
  rbd: add ioctl for rbd
  ceph: use truncate_pagecache() instead of truncate_inode_pages()
  ceph: include time stamp in every MDS request
  rbd: fix ida/idr memory leak
  rbd: use reference counts for image requests
  rbd: fix osd_request memory leak in __rbd_dev_header_watch_sync()
  rbd: make sure we have latest osdmap on 'rbd map'
  libceph: add ceph_monc_wait_osdmap()
  libceph: mon_get_version request infrastructure
  libceph: recognize poolop requests in debugfs
  ceph: refactor readpage_nounlock() to make the logic clearer
  mds: check cap ID when handling cap export message
  ceph: remember subtree root dirfrag's auth MDS
  ceph: introduce ceph_fill_fragtree()
  ceph: handle cap import atomically
  ceph: pre-allocate ceph_cap struct for ceph_add_cap()
  ceph: update inode fields according to issued caps
  rbd: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
  ...
---

6d87c225f5d82d29243dc124f1ffcbb0e14ec358
diff --cc fs/ceph/inode.c
index e4fff9ff1c27,0901f38547fe..04c89c266cec
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@@ -818,10 -867,9 +867,9 @@@ static int fill_inode(struct inode *ino
  			ci->i_snap_caps |= le32_to_cpu(info->cap.caps);
  			if (cap_fmode >= 0)
  				__ceph_get_fmode(ci, cap_fmode);
- 			spin_unlock(&ci->i_ceph_lock);
  		}
  	} else if (cap_fmode >= 0) {
 -		pr_warning("mds issued no caps on %llx.%llx\n",
 +		pr_warn("mds issued no caps on %llx.%llx\n",
  			   ceph_vinop(inode));
  		__ceph_get_fmode(ci, cap_fmode);
  	}