From patchwork Tue Jun 28 18:06:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Vrabel X-Patchwork-Id: 9203781 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0777360B17 for ; Tue, 28 Jun 2016 18:08:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F20552860F for ; Tue, 28 Jun 2016 18:08:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6D5E28610; Tue, 28 Jun 2016 18:08:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 652A528611 for ; Tue, 28 Jun 2016 18:08:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bHxOx-0003Bw-UM; Tue, 28 Jun 2016 18:06:23 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bHxOw-0003Bk-JR for xen-devel@lists.xenproject.org; Tue, 28 Jun 2016 18:06:22 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 81/00-09256-D9CB2775; Tue, 28 Jun 2016 18:06:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrohUnfunqJ wg44tChbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aZC3+YC17xVUw+uZC5gXEXTxcjJ4eEgL/E v7dH2UFsNgEdicdLZoDZIkD274azLF2MXBzMAg8YJZ78esUIkhAWcJdYeX4ucxcjBweLgKrEh q8hIGFeoPDTzauZIWbKSZw//hPM5hTwkLiwfCmYLQRU86j5DTuErSLxce0qVoheQYmTM5+wgN jMAhISB1+8ABsvIcAt8bfbfgIj3ywkVbOQVC1gZFrFqF6cWlSWWqRrrJdUlJmeUZKbmJmja2h gppebWlycmJ6ak5hUrJecn7uJERhQDECwg7Hjn9MhRkkOJiVR3rq1ReFCfEn5KZUZicUZ8UWl OanFhxhlODiUJHgddwPlBItS01Mr0jJzgKENk5bg4FES4c0ESfMWFyTmFmemQ6ROMSpKifPKg SQEQBIZpXlwbbB4usQoKyXMywh0iBBPQWpRbmYJqvwrRnEORiVhXluQKTyZeSVw018BLWYCWs xanQ+yuCQRISXVwJjtuvRYtdz2S7x7NpnnR7OzL5pzt1mmYrb+8vCGa67cr4pC/qp/U1z3+d9 pZqPqvf+fHtG8aVJScU3aSt5PP0+keqdThkZeuWdcEmfstJTXwj6cBYqtsyzaPXhEq+/3MNzx stVY33Bb8M7ZvNgzq13ErsRpLA9lidiW8TI9lcHFL9z4oPE3JZbijERDLeai4kQAIQKxfaICA AA= X-Env-Sender: prvs=980c37e66=david.vrabel@citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1467137179!20782757!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55871 invoked from network); 28 Jun 2016 18:06:21 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jun 2016 18:06:21 -0000 X-IronPort-AV: E=Sophos;i="5.26,542,1459814400"; d="scan'208";a="363291892" From: David Vrabel To: Alexander Viro Date: Tue, 28 Jun 2016 19:06:06 +0100 Message-ID: <1467137167-28546-2-git-send-email-david.vrabel@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1467137167-28546-1-git-send-email-david.vrabel@citrix.com> References: <1467137167-28546-1-git-send-email-david.vrabel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Juergen Gross , linux-kernel@vger.kernel.org, David Vrabel , linux-fsdevel@vger.kernel.org, xen-devel@lists.xenproject.org, Boris Ostrovsky Subject: [Xen-devel] [PATCHv3 1/2] libfs: allow simple_fill_super() to add symlinks X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP simple_fill_super() will add symlinks if an entry has mode & S_IFLNK. The target is provided in the new "link" field. Signed-off-by: David Vrabel --- v2: - simplified. --- fs/libfs.c | 15 +++++++++++++-- include/linux/fs.h | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index cedeacb..bbf2d82 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -512,9 +512,20 @@ int simple_fill_super(struct super_block *s, unsigned long magic, dput(dentry); goto out; } - inode->i_mode = S_IFREG | files->mode; + if (files->mode & S_IFLNK) { + inode->i_mode = files->mode; + inode->i_op = &simple_symlink_inode_operations; + inode->i_link = kstrdup(files->link, GFP_KERNEL); + if (!inode->i_link) { + iput(inode); + dput(dentry); + goto out; + } + } else { + inode->i_mode = S_IFREG | files->mode; + inode->i_fop = files->ops; + } inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; - inode->i_fop = files->ops; inode->i_ino = i; d_add(dentry, inode); } diff --git a/include/linux/fs.h b/include/linux/fs.h index dd28814..20c54a2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2953,7 +2953,7 @@ extern const struct file_operations simple_dir_operations; extern const struct inode_operations simple_dir_inode_operations; extern void make_empty_dir_inode(struct inode *inode); extern bool is_empty_dir_inode(struct inode *inode); -struct tree_descr { char *name; const struct file_operations *ops; int mode; }; +struct tree_descr { char *name; const struct file_operations *ops; int mode; char *link; }; struct dentry *d_alloc_name(struct dentry *, const char *); extern int simple_fill_super(struct super_block *, unsigned long, struct tree_descr *); extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count);