From patchwork Wed Aug 5 19:48:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Marshall X-Patchwork-Id: 6952641 Return-Path: X-Original-To: patchwork-linux-fsdevel@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 87C67C05AC for ; Wed, 5 Aug 2015 19:48:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF75120380 for ; Wed, 5 Aug 2015 19:48:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86C0420373 for ; Wed, 5 Aug 2015 19:48:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752784AbbHETsu (ORCPT ); Wed, 5 Aug 2015 15:48:50 -0400 Received: from mail-qk0-f176.google.com ([209.85.220.176]:36732 "EHLO mail-qk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752050AbbHETst (ORCPT ); Wed, 5 Aug 2015 15:48:49 -0400 Received: by qkdv3 with SMTP id v3so18954818qkd.3 for ; Wed, 05 Aug 2015 12:48:49 -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=KJuK784rlDE8dI4cuFjdYFMt9XoAH3S+VI3qSacDwvs=; b=Rzmvkt75cnNBml1jmGsdh+1QQOeLoRUdNkMt82skP0jCiynXqxfAVkO6xzeka/I33t o8x5GMdvDEyrAiHcaV+KmBiYwhQAo1tM913b4XXK1hVQf+RIXUSIpiLol5WjrWI5avnp Mb16ceey/5s8mp0eUtpWQ8u27uRoTkISs4Qy9XJ/cSbqJBa0+a8VBdNldR54qmM3nirJ jQo8sI1BVMRR50UtgUQpD+H5swZQbDDLUPOGj2DQiLRqH1ued/Y44O9naO2NZX1KZzSv 0AtGfnj36uKrOZ2WMXKNX2c6Kc2esjy7I+ntGrpJ9QlaZidkGOn83BBotAYlXomF1k9w bHDQ== X-Gm-Message-State: ALoCoQlIOuFdHGUaBGl0C1KxAdoXs2GwbE8ABMLNQIDtcKUiK9BXk45q9zlcOqX1XipEXKSr45mu X-Received: by 10.55.22.220 with SMTP id 89mr19916665qkw.74.1438804128981; Wed, 05 Aug 2015 12:48:48 -0700 (PDT) Received: from logtruck.clemson.edu (logtruck.clemson.edu. [130.127.148.78]) by smtp.gmail.com with ESMTPSA id 19sm246293qhx.39.2015.08.05.12.48.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Aug 2015 12:48:47 -0700 (PDT) From: hubcap X-Google-Original-From: hubcap To: viro@zeniv.linux.org.uk Cc: Mike Marshall , linux-fsdevel@vger.kernel.org Subject: [PATCH V3 12/7] Orangefs: use inode_set_bytes for directories Date: Wed, 5 Aug 2015 15:48:38 -0400 Message-Id: <1438804120-10923-1-git-send-email-hubcap@logtruck.clemson.edu> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1437143897-9069-1-git-send-email-root@logtruck.clemson.edu> References: <1437143897-9069-1-git-send-email-root@logtruck.clemson.edu> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.0 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 From: Mike Marshall Signed-off-by: Mike Marshall --- fs/orangefs/pvfs2-utils.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/orangefs/pvfs2-utils.c b/fs/orangefs/pvfs2-utils.c index 6eecb18..11ee073 100644 --- a/fs/orangefs/pvfs2-utils.c +++ b/fs/orangefs/pvfs2-utils.c @@ -162,12 +162,11 @@ static int copy_attributes_to_inode(struct inode *inode, } /*FALLTHRU*/ default: + inode->i_size = PAGE_CACHE_SIZE; + pvfs2_lock_inode(inode); - inode->i_bytes = (unsigned short)PAGE_CACHE_SIZE; - inode->i_blocks = (unsigned long)(PAGE_CACHE_SIZE / 512); + inode_set_bytes(inode, inode->i_size); pvfs2_unlock_inode(inode); - - inode->i_size = PAGE_CACHE_SIZE; break; }