Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=af6370ea9268443351d6e931c702dc8162a1c8a1
Commit:     af6370ea9268443351d6e931c702dc8162a1c8a1
Parent:     eb41d9465cdafee45e0cb30f3b7338646221908e
Author:     Greg Kroah-Hartman <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 2 13:20:40 2007 -0700
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Thu Jan 24 20:40:18 2008 -0800

    ecryptfs: remove version_str file from sysfs
    
    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 <[EMAIL PROTECTED]>
    Cc: Mike Halcrow <[EMAIL PROTECTED]>
    Cc: Phillip Hellewell <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 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 6ded37b..d984eac 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -744,51 +744,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,
 };
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to