From patchwork Thu Aug 22 00:09:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khazhy Kumykov X-Patchwork-Id: 11108303 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C337174A for ; Thu, 22 Aug 2019 00:10:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A84F22DD3 for ; Thu, 22 Aug 2019 00:10:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="D6AQoA1l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729326AbfHVAJ4 (ORCPT ); Wed, 21 Aug 2019 20:09:56 -0400 Received: from mail-vs1-f74.google.com ([209.85.217.74]:41689 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728705AbfHVAJ4 (ORCPT ); Wed, 21 Aug 2019 20:09:56 -0400 Received: by mail-vs1-f74.google.com with SMTP id k1so1358803vsq.8 for ; Wed, 21 Aug 2019 17:09:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=pv63BqJG13E00+xwd/kF1jAWY+UxyXW33fdXaIG0kq8=; b=D6AQoA1ldI7Td2oaG347F6IipHY5tct5IVr+ZroY46wc2oeOBig9h8SX4dVUwbmpkk wJ9SvoTKVLRLyS0KQGzGDBHsHrzk7paM9h/bx2REKW+54BkeqdsWziITIIAgHqJqmgeI Fttd73tnUVn7lBOt4rStJQHq4ekEuATA+hFFL3ytj+VuWFykDfR4/Uv1hTrOiehHHXFq J6NvzzRX9hadxjvziCkeZI5JP4NdeJOigPiTCkAOOX2LJcLP/GWAjDKL+UqcTpy1wFay 5bOjifnewYNs0sm+ha3kwdNZYvK1/4Ye3s2j1ZCKveddw1LJGk3scOM0xNfySseyHuuN Fa9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=pv63BqJG13E00+xwd/kF1jAWY+UxyXW33fdXaIG0kq8=; b=cVXWVR9A670F2DocHPLcMzUwmrRURjjZb4iLoQJLdn27y8PTEJhIsmwXs/un/W1Nuv bMfvSwMj5wVOEXhQrZ6aleNKH2BgvLyPNuJOD7EK2WuFcMk3G+rRhZINnT8IYkluYRq2 JCaIcbUxOpQKupkZuYzYP+Cw1xqwqaxQnoqpjWyhuvawIs+KHCVL1r09kHs5DLFoNPgp 6LzW+cFiKpOuz/pgJwMy2loXqvGf23tTtHeRwd3Ct4bkYiTbsm6yCHgrUozNcEAELBPQ fyMN/CG+zJC73hvKufYEKBgCe6bE22LgFg0PJDUHwmwUIpingV9ZHiSbFcpItrHBuz26 LIUw== X-Gm-Message-State: APjAAAWvT5w9JVnsE8qUfJQs6LJjBD/bRz2Sb5PHsO71RdbHHDX73jqB doixoHhqyy2pFw9JMLHHjdOkMECZ6Vo= X-Google-Smtp-Source: APXvYqwm9+jVtbSYDQW7U2by/dHV3bsRwuVzMr7tlKUcqfS6l0SD4nj4sPXvOx6Hn1BrOVmcOdvhza1U1h0= X-Received: by 2002:a9f:3110:: with SMTP id m16mr4238732uab.10.1566432594812; Wed, 21 Aug 2019 17:09:54 -0700 (PDT) Date: Wed, 21 Aug 2019 17:09:31 -0700 Message-Id: <20190822000933.180870-1-khazhy@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH 1/3] fuse: on 64-bit store time in d_fsdata directly From: Khazhismel Kumykov To: miklos@szeredi.hu Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, shakeelb@google.com, Khazhismel Kumykov Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Implements the optimization noted in f75fdf22b0a8 ("fuse: don't use ->d_time"), as the additional memory can be significant. (In particular, on SLAB configurations this 8-byte alloc becomes 32 bytes). Per-dentry, this can consume significant memory. Signed-off-by: Khazhismel Kumykov Reviewed-by: Shakeel Butt --- fs/fuse/dir.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index dd0f64f7bc06..f9c59a296568 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -24,6 +24,18 @@ static void fuse_advise_use_readdirplus(struct inode *dir) set_bit(FUSE_I_ADVISE_RDPLUS, &fi->state); } +#if BITS_PER_LONG >= 64 +static inline void fuse_dentry_settime(struct dentry *entry, u64 time) +{ + entry->d_fsdata = (void *) time; +} + +static inline u64 fuse_dentry_time(struct dentry *entry) +{ + return (u64)entry->d_fsdata; +} + +#else union fuse_dentry { u64 time; struct rcu_head rcu; @@ -38,6 +50,7 @@ static inline u64 fuse_dentry_time(struct dentry *entry) { return ((union fuse_dentry *) entry->d_fsdata)->time; } +#endif /* * FUSE caches dentries and attributes with separate timeout. The @@ -242,6 +255,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) goto out; } +#if BITS_PER_LONG < 64 static int fuse_dentry_init(struct dentry *dentry) { dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), GFP_KERNEL); @@ -254,16 +268,21 @@ static void fuse_dentry_release(struct dentry *dentry) kfree_rcu(fd, rcu); } +#endif const struct dentry_operations fuse_dentry_operations = { .d_revalidate = fuse_dentry_revalidate, +#if BITS_PER_LONG < 64 .d_init = fuse_dentry_init, .d_release = fuse_dentry_release, +#endif }; const struct dentry_operations fuse_root_dentry_operations = { +#if BITS_PER_LONG < 64 .d_init = fuse_dentry_init, .d_release = fuse_dentry_release, +#endif }; int fuse_valid_type(int m) From patchwork Thu Aug 22 00:09:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khazhy Kumykov X-Patchwork-Id: 11108305 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2328E912 for ; Thu, 22 Aug 2019 00:10:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00878233A1 for ; Thu, 22 Aug 2019 00:10:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CXWxYdY2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729631AbfHVAKJ (ORCPT ); Wed, 21 Aug 2019 20:10:09 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:40203 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726828AbfHVAKJ (ORCPT ); Wed, 21 Aug 2019 20:10:09 -0400 Received: by mail-pg1-f202.google.com with SMTP id m19so2161435pgv.7 for ; Wed, 21 Aug 2019 17:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=AyQNolgMX833/X5DxQq+yfb1DTSBcK57n5nfh7LiGZY=; b=CXWxYdY2fz8qnTLgNoq5USbT2+vkn500HAIsMO5Uh9eHjkfxfI7UrVZZuZ7SmUGZGP dB3tTHlmMLHOwKhFqMRSIvMsQpUhf3NzCW00PPLLUVvHn9hCDlRC9YCAu3sMSlglmR0/ Ho4YKXnexV7YxR3Z7YeEihCwOO/B5jtZK6Mkq+iiU3qi1QMcq9OFYB67Qt48IXPAP6sa HQmtwfrhdBCdnt8x9N1z+TK2Xs3SKMcICya5PBq3dtfjcT0u56UK6jGAbZ9HEBIDup2U S6yUljm4oQrVtgkp+9Wy3dIycEJmSOLpToqBuQurfL2hkD5Urq403INsyLxlUAnC54FJ xvjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=AyQNolgMX833/X5DxQq+yfb1DTSBcK57n5nfh7LiGZY=; b=fQ5Z8HAN5AgXEuA9kGEqAXpVXZIs9KS1MYB56jmniOpB1n5PZTDlLOrJFT3zZXhzau qSkrQxynEPHnSrS0HZlD4IPW3Xb/ngSH059VlJgTZ/wzXMmTaejixNd+eMDm/iqi+ELh 4i/FwYil8RGPGbMhlhUgHCVYjCmiwAyrQqWN+U4PzM0CjS7SExBqvKbSxJae+u8p4BzT Anw2jgVn5H9kAEHTJG37QZkgUwILXMbg0OuyjouPcy5p66vRAK6tP0M3yRgJfHlyNph5 w6ATsTgDgXhyl2KWz6UxgPOsu9rq09IypLZ1sHty6StO9gd95GNKBPqvsJlDpmiWmbmG Q2SQ== X-Gm-Message-State: APjAAAXBmfkmblYXN9XDeXmtFow//t2DCUT/tCQ/fR28OBx4dITp8+UB KvBkcmc80Nk/8MgR3jbP2n7I0H8xGL0= X-Google-Smtp-Source: APXvYqwr2mvIzGXC8hI6pNkeL55T9ffQqD9wqaDUaCXOxOADS+4j1W7TF4BrTjUWGizCe7lMBn0Q/Ueakbk= X-Received: by 2002:a63:704:: with SMTP id 4mr31164087pgh.242.1566432608279; Wed, 21 Aug 2019 17:10:08 -0700 (PDT) Date: Wed, 21 Aug 2019 17:09:32 -0700 In-Reply-To: <20190822000933.180870-1-khazhy@google.com> Message-Id: <20190822000933.180870-2-khazhy@google.com> Mime-Version: 1.0 References: <20190822000933.180870-1-khazhy@google.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH 2/3] fuse: kmemcg account fs data From: Khazhismel Kumykov To: miklos@szeredi.hu Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, shakeelb@google.com, Khazhismel Kumykov Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org account per-file, dentry, and inode data accounts the per-file reserved request, adding new fuse_request_alloc_account() blockdev/superblock and temporary per-request data was left alone, as this usually isn't accounted Signed-off-by: Khazhismel Kumykov --- fs/fuse/dev.c | 6 ++++++ fs/fuse/dir.c | 3 ++- fs/fuse/file.c | 4 ++-- fs/fuse/fuse_i.h | 2 ++ fs/fuse/inode.c | 3 ++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index ea8237513dfa..a0d166a6596f 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -97,6 +97,12 @@ struct fuse_req *fuse_request_alloc(unsigned npages) } EXPORT_SYMBOL_GPL(fuse_request_alloc); +struct fuse_req *fuse_request_alloc_account(unsigned int npages) +{ + return __fuse_request_alloc(npages, GFP_KERNEL_ACCOUNT); +} +EXPORT_SYMBOL_GPL(fuse_request_alloc_account); + struct fuse_req *fuse_request_alloc_nofs(unsigned npages) { return __fuse_request_alloc(npages, GFP_NOFS); diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index f9c59a296568..2013e1222de7 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -258,7 +258,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) #if BITS_PER_LONG < 64 static int fuse_dentry_init(struct dentry *dentry) { - dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), GFP_KERNEL); + dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), + GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE); return dentry->d_fsdata ? 0 : -ENOMEM; } diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 5ae2828beb00..c584ad7478b3 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -45,12 +45,12 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc) { struct fuse_file *ff; - ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL); + ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL_ACCOUNT); if (unlikely(!ff)) return NULL; ff->fc = fc; - ff->reserved_req = fuse_request_alloc(0); + ff->reserved_req = fuse_request_alloc_account(0); if (unlikely(!ff->reserved_req)) { kfree(ff); return NULL; diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 24dbca777775..08161b2d9b08 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -904,6 +904,8 @@ void __exit fuse_ctl_cleanup(void); */ struct fuse_req *fuse_request_alloc(unsigned npages); +struct fuse_req *fuse_request_alloc_account(unsigned int npages); + struct fuse_req *fuse_request_alloc_nofs(unsigned npages); bool fuse_req_realloc_pages(struct fuse_conn *fc, struct fuse_req *req, diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 4bb885b0f032..eab44ddc68b9 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -76,7 +76,8 @@ struct fuse_mount_data { struct fuse_forget_link *fuse_alloc_forget(void) { - return kzalloc(sizeof(struct fuse_forget_link), GFP_KERNEL); + return kzalloc(sizeof(struct fuse_forget_link), + GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE); } static struct inode *fuse_alloc_inode(struct super_block *sb) From patchwork Thu Aug 22 00:09:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khazhy Kumykov X-Patchwork-Id: 11108307 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86281174A for ; Thu, 22 Aug 2019 00:10:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B1FB2339E for ; Thu, 22 Aug 2019 00:10:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="qcfbni3/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729830AbfHVAKU (ORCPT ); Wed, 21 Aug 2019 20:10:20 -0400 Received: from mail-qk1-f201.google.com ([209.85.222.201]:39550 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728708AbfHVAKU (ORCPT ); Wed, 21 Aug 2019 20:10:20 -0400 Received: by mail-qk1-f201.google.com with SMTP id x1so4035323qkn.6 for ; Wed, 21 Aug 2019 17:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=P8ssXLKpWz3dO+L/AUmFrcUKfRbWMuHcZo3K2YQxJJ8=; b=qcfbni3/3DneHgntzEVhw3wMy55yRm12nJQQTI2ECUtoNhnlw0p3Xee/s1iFbhsoxZ 9/wpVNPHTm+csKaXOt/kswfSQuOgK/Fc47SexQwN0d55+25O6gPtRnuj8++/MZ2qWdbS RlvDltla5e8Fun1G6q7gUU88KT6Sy3vy0zYlcZDrJ3+36jdGAfhBpnowbwqymQJdrNoL CzlvzeTABheJWbZP63ujpk+rKvbNYv1CZ1FQrQCCFhlW+GAn/hV0CcRu3/kBZtr5xnpC w+CBMcm6kkQpoeomv59Uro1SdEtkAXnZulDlRViukVGGkOErmcoK+r5I1fVq5D5U9OWZ agvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=P8ssXLKpWz3dO+L/AUmFrcUKfRbWMuHcZo3K2YQxJJ8=; b=KLXgKP/nhxPVh+IW5cyWgFq07JsOsrOfC/Rhh9a3ZroZmGVbKWfnDvARUJhLKU0J+h a450LsCyL041epN2vFKwLIR8Gf59ndncHAaDbivmIWzVTQft3uQ9dFOi95aboPDSp1MA Gz9+vWnlyGALoEcePaJoTodGkh/NEe0ou17Z4+7TwQnnfG6n8A61kIz4V7MgTJThaQ6+ jc2IAPrUcO6UtEpR2Jyp8RJ54eP8qVCcuxuYAvpehntuNzaretZdK3QK1XcqAdw5Q1tZ iDaFDwv6GFGadY6nvS9sQmaCn+zi2IWggdxjpA5NlQXqNeVy34Rh8Ui9Ia2beti5WZo0 faGQ== X-Gm-Message-State: APjAAAXE4HpcIHVKDIhNVi386nvZD2Hnn0qjkdusEejyimEpN/YXt0+C zMofmDDGSkt2M/RtvehW0UND2+RyzN4= X-Google-Smtp-Source: APXvYqzxAqXTttLoLGD8f0LIHLw/pQl585k09x/5RK5w7QEfiHv7Gqk9CkT5QYivkFwC+ptUp0kBjRqZDks= X-Received: by 2002:a37:680e:: with SMTP id d14mr22449033qkc.207.1566432618660; Wed, 21 Aug 2019 17:10:18 -0700 (PDT) Date: Wed, 21 Aug 2019 17:09:33 -0700 In-Reply-To: <20190822000933.180870-1-khazhy@google.com> Message-Id: <20190822000933.180870-3-khazhy@google.com> Mime-Version: 1.0 References: <20190822000933.180870-1-khazhy@google.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH 3/3] fuse: pass gfp flags to fuse_request_alloc From: Khazhismel Kumykov To: miklos@szeredi.hu Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, shakeelb@google.com, Khazhismel Kumykov Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Instead of having a helper per flag Signed-off-by: Khazhismel Kumykov --- fs/fuse/dev.c | 22 +++------------------- fs/fuse/file.c | 6 +++--- fs/fuse/fuse_i.h | 6 +----- fs/fuse/inode.c | 4 ++-- 4 files changed, 9 insertions(+), 29 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index a0d166a6596f..c957620ce7ba 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -66,7 +66,7 @@ static struct page **fuse_req_pages_alloc(unsigned int npages, gfp_t flags, return pages; } -static struct fuse_req *__fuse_request_alloc(unsigned npages, gfp_t flags) +struct fuse_req *fuse_request_alloc(unsigned int npages, gfp_t flags) { struct fuse_req *req = kmem_cache_zalloc(fuse_req_cachep, flags); if (req) { @@ -90,24 +90,8 @@ static struct fuse_req *__fuse_request_alloc(unsigned npages, gfp_t flags) } return req; } - -struct fuse_req *fuse_request_alloc(unsigned npages) -{ - return __fuse_request_alloc(npages, GFP_KERNEL); -} EXPORT_SYMBOL_GPL(fuse_request_alloc); -struct fuse_req *fuse_request_alloc_account(unsigned int npages) -{ - return __fuse_request_alloc(npages, GFP_KERNEL_ACCOUNT); -} -EXPORT_SYMBOL_GPL(fuse_request_alloc_account); - -struct fuse_req *fuse_request_alloc_nofs(unsigned npages) -{ - return __fuse_request_alloc(npages, GFP_NOFS); -} - static void fuse_req_pages_free(struct fuse_req *req) { if (req->pages != req->inline_pages) @@ -207,7 +191,7 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages, if (fc->conn_error) goto out; - req = fuse_request_alloc(npages); + req = fuse_request_alloc(npages, GFP_KERNEL); err = -ENOMEM; if (!req) { if (for_background) @@ -316,7 +300,7 @@ struct fuse_req *fuse_get_req_nofail_nopages(struct fuse_conn *fc, wait_event(fc->blocked_waitq, fc->initialized); /* Matches smp_wmb() in fuse_set_initialized() */ smp_rmb(); - req = fuse_request_alloc(0); + req = fuse_request_alloc(0, GFP_KERNEL); if (!req) req = get_reserved_req(fc, file); diff --git a/fs/fuse/file.c b/fs/fuse/file.c index c584ad7478b3..ae8c8016bb8e 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -50,7 +50,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc) return NULL; ff->fc = fc; - ff->reserved_req = fuse_request_alloc_account(0); + ff->reserved_req = fuse_request_alloc(0, GFP_KERNEL_ACCOUNT); if (unlikely(!ff->reserved_req)) { kfree(ff); return NULL; @@ -1703,7 +1703,7 @@ static int fuse_writepage_locked(struct page *page) set_page_writeback(page); - req = fuse_request_alloc_nofs(1); + req = fuse_request_alloc(1, GFP_NOFS); if (!req) goto err; @@ -1923,7 +1923,7 @@ static int fuse_writepages_fill(struct page *page, struct fuse_inode *fi = get_fuse_inode(inode); err = -ENOMEM; - req = fuse_request_alloc_nofs(FUSE_REQ_INLINE_PAGES); + req = fuse_request_alloc(FUSE_REQ_INLINE_PAGES, GFP_NOFS); if (!req) { __free_page(tmp_page); goto out_unlock; diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 08161b2d9b08..8080a51096e9 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -902,11 +902,7 @@ void __exit fuse_ctl_cleanup(void); /** * Allocate a request */ -struct fuse_req *fuse_request_alloc(unsigned npages); - -struct fuse_req *fuse_request_alloc_account(unsigned int npages); - -struct fuse_req *fuse_request_alloc_nofs(unsigned npages); +struct fuse_req *fuse_request_alloc(unsigned int npages, gfp_t flags); bool fuse_req_realloc_pages(struct fuse_conn *fc, struct fuse_req *req, gfp_t flags); diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index eab44ddc68b9..ad92e93eaddd 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1178,13 +1178,13 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) /* Root dentry doesn't have .d_revalidate */ sb->s_d_op = &fuse_dentry_operations; - init_req = fuse_request_alloc(0); + init_req = fuse_request_alloc(0, GFP_KERNEL); if (!init_req) goto err_put_root; __set_bit(FR_BACKGROUND, &init_req->flags); if (is_bdev) { - fc->destroy_req = fuse_request_alloc(0); + fc->destroy_req = fuse_request_alloc(0, GFP_KERNEL); if (!fc->destroy_req) goto err_free_init_req; }