Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763467AbXKCAMg (ORCPT ); Fri, 2 Nov 2007 20:12:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762187AbXKCACi (ORCPT ); Fri, 2 Nov 2007 20:02:38 -0400 Received: from ns.suse.de ([195.135.220.2]:41200 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762184AbXKCACh (ORCPT ); Fri, 2 Nov 2007 20:02:37 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Kay Sievers , Mike Halcrow , Phillip Hellewell Subject: [PATCH 37/54] ecryptfs: remove version_str file from sysfs Date: Fri, 2 Nov 2007 16:59:15 -0700 Message-Id: <1194047972-9850-37-git-send-email-gregkh@suse.de> X-Mailer: git-send-email 1.5.3.4 In-Reply-To: <20071102235758.GA9803@kroah.com> References: <20071102235758.GA9803@kroah.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2346 Lines: 77 This file violates the one-value-per-file sysfs rule. If you all want it added back, please do something like a per-feature file to show what is present and what isn't. Cc: Kay Sievers Cc: Mike Halcrow Cc: Phillip Hellewell Signed-off-by: Greg Kroah-Hartman --- fs/ecryptfs/main.c | 43 ------------------------------------------- 1 files changed, 0 insertions(+), 43 deletions(-) diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 828fb99..286ade1 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -740,51 +740,8 @@ static ssize_t version_show(struct kobject *kobj, static struct kobj_attribute version_attr = __ATTR_RO(version); -static struct ecryptfs_version_str_map_elem { - u32 flag; - char *str; -} ecryptfs_version_str_map[] = { - {ECRYPTFS_VERSIONING_PASSPHRASE, "passphrase"}, - {ECRYPTFS_VERSIONING_PUBKEY, "pubkey"}, - {ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH, "plaintext passthrough"}, - {ECRYPTFS_VERSIONING_POLICY, "policy"}, - {ECRYPTFS_VERSIONING_XATTR, "metadata in extended attribute"}, - {ECRYPTFS_VERSIONING_MULTKEY, "multiple keys per file"} -}; - -static ssize_t version_str_show(struct kobject *kobj, - struct kobj_attribute *attr, char *buff) -{ - int i; - int remaining = PAGE_SIZE; - int total_written = 0; - - buff[0] = '\0'; - for (i = 0; i < ARRAY_SIZE(ecryptfs_version_str_map); i++) { - int entry_size; - - if (!(ECRYPTFS_VERSIONING_MASK - & ecryptfs_version_str_map[i].flag)) - continue; - entry_size = strlen(ecryptfs_version_str_map[i].str); - if ((entry_size + 2) > remaining) - goto out; - memcpy(buff, ecryptfs_version_str_map[i].str, entry_size); - buff[entry_size++] = '\n'; - buff[entry_size] = '\0'; - buff += entry_size; - total_written += entry_size; - remaining -= entry_size; - } -out: - return total_written; -} - -static struct kobj_attribute version_attr_str = __ATTR_RO(version_str); - static struct attribute *attributes[] = { &version_attr.attr, - &version_attr_str.attr, NULL, }; -- 1.5.3.4 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/