Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
Linus Torvalds [Thu, 2 Feb 2012 23:47:33 +0000 (15:47 -0800)]
* '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"

1  2 
drivers/block/rbd.c
fs/ceph/caps.c
fs/ceph/dir.c
fs/ceph/mds_client.c
fs/ceph/xattr.c

Simple merge
diff --cc fs/ceph/caps.c
Simple merge
diff --cc 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) &&
Simple merge
diff --cc fs/ceph/xattr.c
Simple merge