From patchwork Mon Mar 9 21:20:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 448234 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6BB08140157 for ; Tue, 10 Mar 2015 08:20:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=MSWOZ8Vh; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754164AbbCIVU3 (ORCPT ); Mon, 9 Mar 2015 17:20:29 -0400 Received: from mail-ig0-f172.google.com ([209.85.213.172]:37103 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754140AbbCIVU1 (ORCPT ); Mon, 9 Mar 2015 17:20:27 -0400 Received: by igbhn18 with SMTP id hn18so24956269igb.2 for ; Mon, 09 Mar 2015 14:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=1FH3R/9k+QdMk9164ikRIPCj+wyuXjHXb/N73smqxy4=; b=MSWOZ8Vhfc4vjC8yqpRKVhFeYkbUDKdjszbug0/f4gfRNITbXN/QBFJZau/nLzgVAV 69zhhPG6dcPECokvDAFLuZZ6rTeO0XFUM7zEusG7LL2E6FzOq1gBBK2Ogifs1znawnnN MhY7GlsD1zJbhMm69sygDHoamPPqKZW0+e0prHFsD1yW8Trc3gsRfVaFalUv+l0QD/0n zbHEofYzasLJI69YN2Xty/bqVrCsOkqgAVDffSZ0Q2H5NMdCxalLHP4zasec6WYW4Vkb PxCoGQAraWx+iLU9LzxAtIFXIm8vXKOFt2QqYDYPHDLEzikzjK1hSySz4kcvSXWppjCj ce5g== X-Received: by 10.50.254.99 with SMTP id ah3mr77501365igd.12.1425936027300; Mon, 09 Mar 2015 14:20:27 -0700 (PDT) Received: from sugar.mtv.corp.google.com ([172.18.110.190]) by mx.google.com with ESMTPSA id i16sm12839669ioe.17.2015.03.09.14.20.25 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Mar 2015 14:20:26 -0700 (PDT) From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= To: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , "David S. Miller" , Eric Dumazet Cc: Theodore Ts'o , netdev@vger.kernel.org Subject: [PATCH 6/8] fs/file: add get_unused_fd_and_install_flags(flags, newfile) api Date: Mon, 9 Mar 2015 14:20:01 -0700 Message-Id: <1425936003-24544-6-git-send-email-zenczykowski@gmail.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1425936003-24544-1-git-send-email-zenczykowski@gmail.com> References: <1425936003-24544-1-git-send-email-zenczykowski@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Żenczykowski Signed-off-by: Maciej Żenczykowski --- fs/file.c | 7 +++++++ include/linux/file.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/fs/file.c b/fs/file.c index 01b1e171ce0a..d3e692e99ec5 100644 --- a/fs/file.c +++ b/fs/file.c @@ -513,6 +513,13 @@ int get_unused_fd_flags(unsigned flags) } EXPORT_SYMBOL(get_unused_fd_flags); +int get_unused_fd_and_install_flags(unsigned flags, struct file *newfile) +{ + return __alloc_fd(current->files, 0, rlimit(RLIMIT_NOFILE), flags, + newfile); +} +EXPORT_SYMBOL(get_unused_fd_and_install_flags); + static void __put_unused_fd(struct files_struct *files, unsigned int fd) { struct fdtable *fdt = files_fdtable(files); diff --git a/include/linux/file.h b/include/linux/file.h index f87d30882a24..92b43187aa39 100644 --- a/include/linux/file.h +++ b/include/linux/file.h @@ -66,6 +66,8 @@ extern void set_close_on_exec(unsigned int fd, int flag); extern bool get_close_on_exec(unsigned int fd); extern void put_filp(struct file *); extern int get_unused_fd_flags(unsigned flags); +extern int get_unused_fd_and_install_flags(unsigned flags, + struct file *newfile); extern void put_unused_fd(unsigned int fd); extern void fd_install(unsigned int fd, struct file *file);