[XFS] kill xfs_uuid_unmount

[linux-2.6-omap-h63xx.git] / security / smack / smackfs.c

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index afe7c9b0732ac6c16ae6677bbfe1ca0ca5ecf799..271a835fbbe3f72f4e5465cbf84b9b271fa7e77a 100644 (file)
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -73,11 +73,6 @@ struct smk_list_entry *smack_list;
 
 #define        SEQ_READ_FINISHED       1
 
-/*
- * Disable concurrent writing open() operations
- */
-static struct semaphore smack_write_sem;
-
 /*
  * Values for parsing cipso rules
  * SMK_DIGITLEN: Length of a digit field in a rule.
@@ -168,32 +163,7 @@ static struct seq_operations load_seq_ops = {
  */
 static int smk_open_load(struct inode *inode, struct file *file)
 {
-       if ((file->f_flags & O_ACCMODE) == O_RDONLY)
-               return seq_open(file, &load_seq_ops);
-
-       if (down_interruptible(&smack_write_sem))
-               return -ERESTARTSYS;
-
-       return 0;
-}
-
-/**
- * smk_release_load - release() for /smack/load
- * @inode: inode structure representing file
- * @file: "load" file pointer
- *
- * For a reading session, use the seq_file release
- * implementation.
- * Otherwise, we are at the end of a writing session so
- * clean everything up.
- */
-static int smk_release_load(struct inode *inode, struct file *file)
-{
-       if ((file->f_flags & O_ACCMODE) == O_RDONLY)
-               return seq_release(inode, file);
-
-       up(&smack_write_sem);
-       return 0;
+       return seq_open(file, &load_seq_ops);
 }
 
 /**
@@ -341,19 +311,20 @@ static const struct file_operations smk_load_ops = {
        .read           = seq_read,
        .llseek         = seq_lseek,
        .write          = smk_write_load,
-       .release        = smk_release_load,
+       .release        = seq_release,
 };
 
 /**
  * smk_cipso_doi - initialize the CIPSO domain
  */
-void smk_cipso_doi(void)
+static void smk_cipso_doi(void)
 {
        int rc;
        struct cipso_v4_doi *doip;
        struct netlbl_audit audit_info;
 
        audit_info.loginuid = audit_get_loginuid(current);
+       audit_info.sessionid = audit_get_sessionid(current);
        audit_info.secid = smack_to_secid(current->security);
 
        rc = netlbl_cfg_map_del(NULL, &audit_info);
@@ -380,12 +351,13 @@ void smk_cipso_doi(void)
 /**
  * smk_unlbl_ambient - initialize the unlabeled domain
  */
-void smk_unlbl_ambient(char *oldambient)
+static void smk_unlbl_ambient(char *oldambient)
 {
        int rc;
        struct netlbl_audit audit_info;
 
        audit_info.loginuid = audit_get_loginuid(current);
+       audit_info.sessionid = audit_get_sessionid(current);
        audit_info.secid = smack_to_secid(current->security);
 
        if (oldambient != NULL) {
@@ -995,12 +967,21 @@ static struct vfsmount *smackfs_mount;
  *
  * register the smackfs
  *
- * Returns 0 unless the registration fails.
+ * Do not register smackfs if Smack wasn't enabled
+ * on boot. We can not put this method normally under the
+ * smack_init() code path since the security subsystem get
+ * initialized before the vfs caches.
+ *
+ * Returns true if we were not chosen on boot or if
+ * we were chosen and filesystem registration succeeded.
  */
 static int __init init_smk_fs(void)
 {
        int err;
 
+       if (!security_module_enable(&smack_ops))
+               return 0;
+
        err = register_filesystem(&smk_fs_type);
        if (!err) {
                smackfs_mount = kern_mount(&smk_fs_type);
@@ -1011,7 +992,6 @@ static int __init init_smk_fs(void)
                }
        }
 
-       sema_init(&smack_write_sem, 1);
        smk_cipso_doi();
        smk_unlbl_ambient(NULL);