Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[sfrench/cifs-2.6.git] / security / smack / smack_lsm.c

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 2717cdd7872c30329773c0ffc8879a36dcb840aa..f1b17a476e12d1f733ba877305b7615964a5f8af 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -167,9 +167,9 @@ static int smk_bu_file(struct file *file, int mode, int rc)
                return rc;
 
        smk_bu_mode(mode, acc);
-       pr_info("Smack Bringup: (%s %s %s) file=(%s %ld %s) %s\n",
+       pr_info("Smack Bringup: (%s %s %s) file=(%s %ld %pD) %s\n",
                sskp->smk_known, (char *)file->f_security, acc,
-               inode->i_sb->s_id, inode->i_ino, file->f_dentry->d_name.name,
+               inode->i_sb->s_id, inode->i_ino, file,
                current->comm);
        return 0;
 }
@@ -190,9 +190,9 @@ static int smk_bu_credfile(const struct cred *cred, struct file *file,
                return rc;
 
        smk_bu_mode(mode, acc);
-       pr_info("Smack Bringup: (%s %s %s) file=(%s %ld %s) %s\n",
+       pr_info("Smack Bringup: (%s %s %s) file=(%s %ld %pD) %s\n",
                sskp->smk_known, smk_of_inode(inode)->smk_known, acc,
-               inode->i_sb->s_id, inode->i_ino, file->f_dentry->d_name.name,
+               inode->i_sb->s_id, inode->i_ino, file,
                current->comm);
        return 0;
 }
@@ -1571,12 +1571,11 @@ static int smack_mmap_file(struct file *file,
  * Returns 0
  * Further research may be required on this one.
  */
-static int smack_file_set_fowner(struct file *file)
+static void smack_file_set_fowner(struct file *file)
 {
        struct smack_known *skp = smk_of_current();
 
        file->f_security = skp;
-       return 0;
 }
 
 /**