From patchwork Thu Aug 18 12:18:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Czerner X-Patchwork-Id: 1076372 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7ICKJPQ017911 for ; Thu, 18 Aug 2011 12:20:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755895Ab1HRMTt (ORCPT ); Thu, 18 Aug 2011 08:19:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1027 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755825Ab1HRMTq (ORCPT ); Thu, 18 Aug 2011 08:19:46 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7ICJTxn010722 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 18 Aug 2011 08:19:29 -0400 Received: from dhcp-27-109.brq.redhat.com (dhcp-1-248.brq.redhat.com [10.34.1.248]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7ICIvqm014104; Thu, 18 Aug 2011 08:19:27 -0400 From: Lukas Czerner To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, Lukas Czerner , Chris Mason , linux-btrfs@vger.kernel.org Subject: [PATCH 5/5] btrfs: use fs netlink interface for ENOSPC conditions Date: Thu, 18 Aug 2011 14:18:26 +0200 Message-Id: <1313669906-14931-6-git-send-email-lczerner@redhat.com> In-Reply-To: <1313669906-14931-1-git-send-email-lczerner@redhat.com> References: <1313669906-14931-1-git-send-email-lczerner@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 18 Aug 2011 12:20:19 +0000 (UTC) Register fs netlink interface and send proper warning if ENOSPC is encountered. Note that we differentiate between enospc for metadata and enospc for data. Signed-off-by: Lukas Czerner Cc: Chris Mason Cc: linux-btrfs@vger.kernel.org --- fs/btrfs/extent-tree.c | 13 ++++++++++--- fs/btrfs/super.c | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 66bac22..a47d9b9 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3029,13 +3029,14 @@ int btrfs_check_data_free_space(struct inode *inode, u64 bytes) { struct btrfs_space_info *data_sinfo; struct btrfs_root *root = BTRFS_I(inode)->root; + struct btrfs_fs_info *fs_info = root->fs_info; u64 used; int ret = 0, committed = 0, alloc_chunk = 1; /* make sure bytes are sectorsize aligned */ bytes = (bytes + root->sectorsize - 1) & ~((u64)root->sectorsize - 1); - if (root == root->fs_info->tree_root || + if (root == fs_info->tree_root || BTRFS_I(inode)->location.objectid == BTRFS_FREE_INO_OBJECTID) { alloc_chunk = 0; committed = 1; @@ -3070,7 +3071,7 @@ alloc: if (IS_ERR(trans)) return PTR_ERR(trans); - ret = do_chunk_alloc(trans, root->fs_info->extent_root, + ret = do_chunk_alloc(trans, fs_info->extent_root, bytes + 2 * 1024 * 1024, alloc_target, CHUNK_ALLOC_NO_FORCE); @@ -3100,7 +3101,7 @@ alloc: /* commit the current transaction and try again */ commit_trans: if (!committed && - !atomic_read(&root->fs_info->open_ioctl_trans)) { + !atomic_read(&fs_info->open_ioctl_trans)) { committed = 1; trans = btrfs_join_transaction(root); if (IS_ERR(trans)) @@ -3111,6 +3112,8 @@ commit_trans: goto again; } + fs_nl_send_warning(fs_info->fs_devices->latest_bdev->bd_dev, + FS_NL_ENOSPC_WARN); return -ENOSPC; } data_sinfo->bytes_may_use += bytes; @@ -3522,6 +3525,10 @@ again: } out: + if (unlikely(-ENOSPC == ret)) { + dev_t bdev = root->fs_info->fs_devices->latest_bdev->bd_dev; + fs_nl_send_warning(bdev, FS_NL_META_ENOSPC_WARN); + } if (flushing) { spin_lock(&space_info->lock); space_info->flush = 0; diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 15634d4..8ac9e01 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1266,6 +1266,7 @@ static int __init init_btrfs_fs(void) if (err) goto unregister_ioctl; + init_fs_nl_family(); printk(KERN_INFO "%s loaded\n", BTRFS_BUILD_VERSION); return 0;