diff options
| author | Milosz Tanski <milosz@adfin.com> | 2013-09-06 12:41:20 -0400 |
|---|---|---|
| committer | Milosz Tanski <milosz@adfin.com> | 2013-09-06 12:41:20 -0400 |
| commit | cd0a2df681ec2af45f50c555c2a39dc92a4dff71 (patch) | |
| tree | 35d2278a9494582025f3dac08feb2266adef6a4d /net/openvswitch/datapath.c | |
| parent | c35455791c1131e7ccbf56ea6fbdd562401c2ce2 (diff) | |
| parent | 5a6f282a2052bb13171b53f03b34501cf72c33f1 (diff) | |
Merge tag 'fscache-fixes-for-ceph' into wip-fscache
Patches for Ceph FS-Cache support
Diffstat (limited to 'net/openvswitch/datapath.c')
| -rw-r--r-- | net/openvswitch/datapath.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index f7e3a0d84c40..f2ed7600084e 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
| @@ -2076,9 +2076,6 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info) | |||
| 2076 | ovs_notify(reply, info, &ovs_dp_vport_multicast_group); | 2076 | ovs_notify(reply, info, &ovs_dp_vport_multicast_group); |
| 2077 | return 0; | 2077 | return 0; |
| 2078 | 2078 | ||
| 2079 | rtnl_unlock(); | ||
| 2080 | return 0; | ||
| 2081 | |||
| 2082 | exit_free: | 2079 | exit_free: |
| 2083 | kfree_skb(reply); | 2080 | kfree_skb(reply); |
| 2084 | exit_unlock: | 2081 | exit_unlock: |