From patchwork Tue Jun 15 13:48:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 106210 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5FDvicv013035 for ; Tue, 15 Jun 2010 13:57:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932136Ab0FON5l (ORCPT ); Tue, 15 Jun 2010 09:57:41 -0400 Received: from mail.pripojeni.net ([217.66.174.14]:54864 "EHLO mail.jetsystems.cz" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1757667Ab0FON5l (ORCPT ); Tue, 15 Jun 2010 09:57:41 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 15 Jun 2010 13:57:45 +0000 (UTC) X-Greylist: delayed 565 seconds by postgrey-1.27 at vger.kernel.org; Tue, 15 Jun 2010 09:57:40 EDT Received: from anemoi.localdomain ([217.66.174.142]) by mail.jetsystems.cz (Kerio Connect 7.0.0 patch 1); Tue, 15 Jun 2010 15:57:57 +0200 From: Jiri Slaby To: chris.mason@oracle.com Cc: linux-kernel@vger.kernel.org, jirislaby@gmail.com, Jiri Slaby , linux-btrfs@vger.kernel.org Subject: [PATCH 1/1] FS: btrfs, use helpers for rlimits Date: Tue, 15 Jun 2010 15:48:08 +0200 Message-Id: <1276609688-2117-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.7.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 44d404c..8f11078 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3576,8 +3576,7 @@ static int btrfs_setattr_size(struct inode *inode, struct iattr *attr) return 0; if (attr->ia_size > inode->i_size) { - unsigned long limit; - limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; + unsigned long limit = rlimit(RLIMIT_FSIZE); if (attr->ia_size > inode->i_sb->s_maxbytes) return -EFBIG; if (limit != RLIM_INFINITY && attr->ia_size > limit) {