From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Feb 2012 23:47:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: upstream/snapshot3+hdmi~8203
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c073a7ee250118b8be3a2379c96fd7f78382b06;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: fix safety of rbd_put_client()
  rbd: fix a memory leak in rbd_get_client()
  ceph: create a new session lock to avoid lock inversion
  ceph: fix length validation in parse_reply_info()
  ceph: initialize client debugfs outside of monc->mutex
  ceph: change "ceph.layout" xattr to be "ceph.file.layout"
---

6c073a7ee250118b8be3a2379c96fd7f78382b06
diff --cc fs/ceph/dir.c
index 618246b,63c52f3..3e8094b
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@@ -973,12 -973,12 +973,12 @@@ static int dentry_lease_is_valid(struc
  
  	spin_lock(&dentry->d_lock);
  	di = ceph_dentry(dentry);
 -	if (di && di->lease_session) {
 +	if (di->lease_session) {
  		s = di->lease_session;
- 		spin_lock(&s->s_cap_lock);
+ 		spin_lock(&s->s_gen_ttl_lock);
  		gen = s->s_cap_gen;
  		ttl = s->s_cap_ttl;
- 		spin_unlock(&s->s_cap_lock);
+ 		spin_unlock(&s->s_gen_ttl_lock);
  
  		if (di->lease_gen == gen &&
  		    time_before(jiffies, dentry->d_time) &&