2012-08-02 16:33:20

by Sage Weil

[permalink] [raw]
Subject: [GIT PULL] Final ceph bits for 3.6

Hi Linus,

Please pull these last two patches from

git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git for-linus

The first patch fixes up the old crufty open intent code to use the
atomic_open stuff properly, and the second fixes a possible null deref and
memory leak with the crypto keys.

Thanks!
sage

----------------------------------------------------------------
Sage Weil (1):
ceph: simplify+fix atomic_open

Sylvain Munaut (1):
libceph: fix crypto key null deref, memory leak

fs/ceph/dir.c | 38 --------------------------------
fs/ceph/file.c | 62 ++++++++++++++++++++++++++++++++---------------------
fs/ceph/super.h | 6 +++---
net/ceph/crypto.c | 1 +
net/ceph/crypto.h | 3 ++-
5 files changed, 43 insertions(+), 67 deletions(-)