From patchwork Thu Jun 5 13:55:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 4305631 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D7ECF9F26E for ; Thu, 5 Jun 2014 13:56:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1957620117 for ; Thu, 5 Jun 2014 13:56:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28F772034F for ; Thu, 5 Jun 2014 13:56:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbaFEN4F (ORCPT ); Thu, 5 Jun 2014 09:56:05 -0400 Received: from mail-ig0-f169.google.com ([209.85.213.169]:34802 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751810AbaFEN4C (ORCPT ); Thu, 5 Jun 2014 09:56:02 -0400 Received: by mail-ig0-f169.google.com with SMTP id a13so3131669igq.4 for ; Thu, 05 Jun 2014 06:56:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xHxcEbDTrgmYzYcakUZsdYmkPg63fmg4K1OBdMrS19w=; b=WzVa/EDe51L6LaxqrVV9xMvZO5tT/1u9QvSGN0YxPKcsC7rbWaO9MppW3a1DSikEqd +8A1RVcYVpgbcqFlYkDxnMRtqiW/TDsRZlGxFRyFiOdh1tscfpQTTEtCPg7W8lbvoK5w oJkdX4/6JQBDdXlPpQH85jzu5lJwF/cRh7nrwysSRSuRTIekeZceilstnlUgGYdqJyjI w21SXZ0VFr51mZhOyvRJdFgu45bD+463Hn/16rcIX/ysYWIVOmxujpMmKAnYWvq4xKfW ognedYi20jujn/r/Qlbmpzz/OSspu7TvUgGx6opMDUMGykRSsZPmlQBGsYtwkhCM6tW6 vqvg== X-Gm-Message-State: ALoCoQlzSfs1NoFTFGUjG6zJNL1tZwQDEKYtLBt1RHbw2aEYl3R+kP9Jl17jKf340yTVt+maPLvD X-Received: by 10.50.55.66 with SMTP id q2mr10773964igp.11.1401976561222; Thu, 05 Jun 2014 06:56:01 -0700 (PDT) Received: from gavrio-wifi.robotsandstuff.fake (c-98-209-19-144.hsd1.mi.comcast.net. [98.209.19.144]) by mx.google.com with ESMTPSA id c8sm30697482igx.8.2014.06.05.06.56.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 05 Jun 2014 06:56:00 -0700 (PDT) From: Weston Andros Adamson To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH pynfs v2 14/16] 4.1 server: get rid of old op_getdeviceinfo Date: Thu, 5 Jun 2014 09:55:42 -0400 Message-Id: <1401976544-36374-15-git-send-email-dros@primarydata.com> X-Mailer: git-send-email 1.8.5.2 (Apple Git-48) In-Reply-To: <1401976544-36374-1-git-send-email-dros@primarydata.com> References: <1401976544-36374-1-git-send-email-dros@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This has been commented out for a while. Signed-off-by: Weston Andros Adamson --- nfs4.1/nfs4server.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/nfs4.1/nfs4server.py b/nfs4.1/nfs4server.py index 3d2d4cf..7ca4d92 100755 --- a/nfs4.1/nfs4server.py +++ b/nfs4.1/nfs4server.py @@ -1867,27 +1867,6 @@ class NFS4Server(rpc.Server): new_cookie >= len(list)) return encode_status(NFS4_OK, res) -# def op_getdeviceinfo(self, arg, env): # STUB -# check_session(env) -# # check_cfh(env) -# # fs = env.cfh.fs -# # STUB - only deals with block volumes -# kind = arg.gdia_layout_type -# if kind != LAYOUT4_BLOCK_VOLUME: -# return encode_status(NFS4ERR_INVAL) -# # STUB - want to pull this from fs, not block module -# d = block.devices.get(arg.gdia_device_id, None) -# if d is None: -# return encode_status(NFS4ERR_INVAL) -# address = device_addr4(LAYOUT4_BLOCK_VOLUME, d.get_addr()) -# # Check that we don't exceed count -# p = nfs4lib.FancyNFS4Packer() -# p.pack_device_addr4(address) -# if len(p.get_buffer()) > arg.gdia_maxcount: -# return encode_status(NFS4ERR_TOOSMALL, gdir_mincount = len(p.get_buffer())) -# res = GETDEVICEINFO4resok(address, 0) -# return encode_status(NFS4_OK, res) - def op_getdeviceinfo(self, arg, env): # STUB # STUB - ignoring notifications check_session(env)