From patchwork Tue Jul 28 11:13:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6883701 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 50195C05AC for ; Tue, 28 Jul 2015 11:13:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 734762071C for ; Tue, 28 Jul 2015 11:13:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B2C8206FA for ; Tue, 28 Jul 2015 11:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932422AbbG1LNS (ORCPT ); Tue, 28 Jul 2015 07:13:18 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:36622 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932443AbbG1LNP (ORCPT ); Tue, 28 Jul 2015 07:13:15 -0400 Received: by pachj5 with SMTP id hj5so68359444pac.3 for ; Tue, 28 Jul 2015 04:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=uMM6Zol4kx/tXI7myCH4UcCf9/T2vN4klskQ7+dLSq0=; b=UvNN0MX3cQK3MVMm2hzh7n13b6DtejvEm+tub9Wzqaz/M/Hd+BOhnYRv+9kJcvKjww FTGuK9Z+N3RHybIjhV9w4pNbAAuMlCRoZsVoPdkLmxhzYZgjehdaY0WmsNXkjNYupzkn 6qxyaw+s+k8LCsB0qM4lS6/+EDSdtG5xiNvd5ybBUEC6eh9SBS9StOtcxAuK5aP+0hm4 MoCl5HOc8PjfFzcLCVHYxTXwlvstRC5vwFphS0apTnIGQ8g//ccvX9Gk7UWY2Avwaffr dYpEyfIyg2S8BVgQyVPKvBjSZn+UXxQicO3vpXY0oRBC1JAQuoaX9ymN9PwXRlpTs4dO xNjA== X-Received: by 10.66.236.70 with SMTP id us6mr80104140pac.39.1438081995261; Tue, 28 Jul 2015 04:13:15 -0700 (PDT) Received: from [192.168.99.11] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id pc9sm34668827pdb.6.2015.07.28.04.13.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2015 04:13:14 -0700 (PDT) Message-ID: <55B763BE.5060405@gmail.com> Date: Tue, 28 Jul 2015 19:13:02 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Trond Myklebust , "linux-nfs@vger.kernel.org" CC: osandov@osandov.com, kinglongmee@gmail.com Subject: [PATCH 3/5] NFS: Check size by inode_newsize_ok in nfs_setattr Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Set rlimit for NFS's files is useless right now. For local process's rlimit, it should be checked by nfs client. The same, CIFS also call inode_change_ok checking rlimit at its client in cifs_setattr_nounix() and cifs_setattr_unix(). Signed-off-by: Kinglong Mee --- fs/nfs/inode.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index b77b328..eed6104 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -512,15 +512,14 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_valid &= ~ATTR_MODE; if (attr->ia_valid & ATTR_SIZE) { - loff_t i_size; - BUG_ON(!S_ISREG(inode->i_mode)); - i_size = i_size_read(inode); - if (attr->ia_size == i_size) + error = inode_newsize_ok(inode, attr->ia_size); + if (error) + return error; + + if (attr->ia_size == i_size_read(inode)) attr->ia_valid &= ~ATTR_SIZE; - else if (attr->ia_size < i_size && IS_SWAPFILE(inode)) - return -ETXTBSY; } /* Optimization: if the end result is no change, don't RPC */