summaryrefslogtreecommitdiff
path: root/fs/ceph/export.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-13 22:33:29 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-13 22:33:29 +0400
commitb240add62c7c0e15bfaba59fa37bd44480e31681 (patch)
tree16005042c70e0dfbe885bb8b5553d3a36c7bf61d /fs/ceph/export.c
parent51f1206f607878716cbeaf8da4efa9399ed16e54 (diff)
parent77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff)
downloadlinux-b240add62c7c0e15bfaba59fa37bd44480e31681.tar.xz
Merge 3.7-rc5 into usb-next
This pulls in the 3.7-rc5 branch into usb-next
Diffstat (limited to 'fs/ceph/export.c')
-rw-r--r--fs/ceph/export.c2
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;
}