diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-29 19:49:25 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-29 19:49:25 +0400 |
| commit | 35fd3dc58da675d659513384221349ef90749a01 (patch) | |
| tree | 2ee64e48f39c0c14d454d57a8af022af9e977dd4 /fs | |
| parent | 6b0cb4eef7bdaa27b8021ea81813fba330a2d94d (diff) | |
| parent | 52eb5a900a9863a8b77a895f770e5d825c8e02c6 (diff) | |
| download | linux-35fd3dc58da675d659513384221349ef90749a01.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes form Sage Weil:
"There are two fixes in the messenger code, one that can trigger a NULL
dereference, and one that error in refcounting (extra put). There is
also a trivial fix that in the fs client code that is triggered by NFS
reexport."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: fix dentry reference leak in encode_fh()
libceph: avoid NULL kref_put when osd reset races with alloc_msg
rbd: reset BACKOFF if unable to re-queue
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/export.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/export.c b/fs/ceph/export.c index 02ce90972d81..9349bb37a2fe 100644 --- a/fs/ceph/export.c +++ b/fs/ceph/export.c @@ -90,6 +90,8 @@ static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len, *max_len = handle_length; type = 255; } + if (dentry) + dput(dentry); return type; } |