http://jfs.bkbits.net/linux-2.5
domen@coderock.org|ChangeSet|20041229162536|32230 domen
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/12/29 10:25:36-06:00 domen@coderock.org
# JFS: delete unused file
#
# Remove nowhere referenced file. (egrep "filename\." didn't find anything)
#
# Signed-off-by: Domen Puncer <domen@coderock.org>
# Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
#
# BitKeeper/deleted/.del-jfs_defragfs.h~1e8a3d543f69975a
# 2004/12/29 10:20:36-06:00 shaggy@austin.ibm.com +0 -0
# Delete: fs/jfs/jfs_defragfs.h
#
# ChangeSet
# 2004/12/13 07:58:37-08:00 jfs.adm@bkbits.net
# Merge bk://linux.bkbits.net/linux-2.5
# into bkbits.net:/repos/j/jfs/linux-2.5
#
# fs/Kconfig
# 2004/12/13 07:58:30-08:00 jfs.adm@bkbits.net +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/07 15:38:26-06:00 shaggy@austin.ibm.com
# JFS: flush new iag from bd_inode's mapping
#
# This is a fix to help jfs work with grub. A new IAG is created in
# the bd_inode's mapping, but subsequently modified in a different
# mapping. We should invalidate the former page to keep grub from
# using that cached page. It isn't useful to have it cached anyway,
# since jfs will never access it again through that mapping.
#
# Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
#
# fs/jfs/jfs_metapage.c
# 2004/12/07 15:38:08-06:00 shaggy@austin.ibm.com +1 -8
# META_discard no longer implies that we clear the write flag
#
# fs/jfs/jfs_imap.c
# 2004/12/07 15:38:08-06:00 shaggy@austin.ibm.com +6 -0
# Invalidate page of newly initialized iag
#
# ChangeSet
# 2004/12/02 16:45:38-06:00 shaggy@austin.ibm.com
# JFS: speed up nointegrity mount
#
# No need to flush metadata to advance the journal's sync-point if
# we're not really writing to the journal
#
# Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
#
# fs/jfs/jfs_logmgr.c
# 2004/12/02 16:45:17-06:00 shaggy@austin.ibm.com +4 -0
# don't need to flush metadata to disk for nointegrity
#
# ChangeSet
# 2004/12/01 16:17:57-06:00 shaggy@austin.ibm.com
# JFS: add security and trusted xattrs
#
# Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
#
# fs/jfs/xattr.c
# 2004/12/01 16:17:46-06:00 shaggy@austin.ibm.com +55 -4
# Add security and trusted xattrs
#
# fs/Kconfig
# 2004/12/01 16:17:46-06:00 shaggy@austin.ibm.com +12 -0
# Add jfs security labels (xattrs)
#
# ChangeSet
# 2004/11/17 12:51:43-06:00 shaggy@austin.ibm.com
# JFS: fix race in jfs_commit_inode
#
# There was a race that resulted in old, deleted inodes being written
# to disk after the inode number had been reused. jfs_commit_inode
# needs to verify that the inode is still linked and dirty before
# committing it.
#
# Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
#
# fs/jfs/inode.c
# 2004/11/17 12:51:26-06:00 shaggy@austin.ibm.com +8 -3
# jfs_commit_inode needs to re-verify that inode is still linked
# and dirty
#
diff -Nru a/fs/Kconfig b/fs/Kconfig
--- a/fs/Kconfig 2005-01-02 23:12:03 -08:00
+++ b/fs/Kconfig 2005-01-02 23:12:03 -08:00
@@ -266,6 +266,18 @@
If you don't know what Access Control Lists are, say N
+config JFS_SECURITY
+ bool "JFS Security Labels"
+ depends on JFS_FS
+ help
+ Security labels support alternative access control models
+ implemented by security modules like SELinux. This option
+ enables an extended attribute handler for file security
+ labels in the jfs filesystem.
+
+ If you are not using a security module that requires using
+ extended attributes for file security labels, say N.
+
config JFS_DEBUG
bool "JFS debugging"
depends on JFS_FS
diff -Nru a/fs/jfs/inode.c b/fs/jfs/inode.c
--- a/fs/jfs/inode.c 2005-01-02 23:12:03 -08:00
+++ b/fs/jfs/inode.c 2005-01-02 23:12:03 -08:00
@@ -81,8 +81,7 @@
* Don't commit if inode has been committed since last being
* marked dirty, or if it has been deleted.
*/
- if (test_cflag(COMMIT_Nolink, inode) ||
- !test_cflag(COMMIT_Dirty, inode))
+ if (inode->i_nlink == 0 || !test_cflag(COMMIT_Dirty, inode))
return 0;
if (isReadOnly(inode)) {
@@ -100,7 +99,13 @@
tid = txBegin(inode->i_sb, COMMIT_INODE);
down(&JFS_IP(inode)->commit_sem);
- rc = txCommit(tid, 1, &inode, wait ? COMMIT_SYNC : 0);
+
+ /*
+ * Retest inode state after taking commit_sem
+ */
+ if (inode->i_nlink && test_cflag(COMMIT_Dirty, inode))
+ rc = txCommit(tid, 1, &inode, wait ? COMMIT_SYNC : 0);
+
txEnd(tid);
up(&JFS_IP(inode)->commit_sem);
return rc;
diff -Nru a/fs/jfs/jfs_defragfs.h b/fs/jfs/jfs_defragfs.h
--- a/fs/jfs/jfs_defragfs.h 2005-01-02 23:12:03 -08:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) International Business Machines Corp., 2000-2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef _H_JFS_DEFRAGFS
-#define _H_JFS_DEFRAGFS
-
-/*
- * defragfs parameter list
- */
-struct defragfs {
- uint flag; /* 4: */
- u8 dev; /* 1: */
- u8 pad[3]; /* 3: */
- s32 fileset; /* 4: */
- u32 inostamp; /* 4: */
- u32 ino; /* 4: */
- u32 gen; /* 4: */
- s64 xoff; /* 8: */
- s64 old_xaddr; /* 8: */
- s64 new_xaddr; /* 8: */
- s32 xlen; /* 4: */
-};
-
-/* plist flag */
-#define DEFRAGFS_SYNC 0x80000000
-#define DEFRAGFS_COMMIT 0x40000000
-#define DEFRAGFS_RELOCATE 0x10000000
-
-#define INODE_TYPE 0x0000F000 /* IFREG or IFDIR */
-
-#define EXTENT_TYPE 0x000000ff
-#define DTPAGE 0x00000001
-#define XTPAGE 0x00000002
-#define DATAEXT 0x00000004
-#define EAEXT 0x00000008
-
-#endif /* _H_JFS_DEFRAGFS */
diff -Nru a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
--- a/fs/jfs/jfs_imap.c 2005-01-02 23:12:03 -08:00
+++ b/fs/jfs/jfs_imap.c 2005-01-02 23:12:03 -08:00
@@ -2604,6 +2604,12 @@
for (i = 0; i < SMAPSZ; i++)
iagp->inosmap[i] = cpu_to_le32(ONES);
+ /*
+ * Invalidate the page after writing and syncing it.
+ * After it's initialized, we access it in a different
+ * address space
+ */
+ set_bit(META_discard, &mp->flag);
flush_metapage(mp);
/*
diff -Nru a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
--- a/fs/jfs/jfs_logmgr.c 2005-01-02 23:12:03 -08:00
+++ b/fs/jfs/jfs_logmgr.c 2005-01-02 23:12:03 -08:00
@@ -980,11 +980,15 @@
* actually make it to disk
*/
list_for_each_entry(sbi, &log->sb_list, log_list) {
+ if (sbi->flag & JFS_NOINTEGRITY)
+ continue;
filemap_fdatawrite(sbi->ipbmap->i_mapping);
filemap_fdatawrite(sbi->ipimap->i_mapping);
filemap_fdatawrite(sbi->sb->s_bdev->bd_inode->i_mapping);
}
list_for_each_entry(sbi, &log->sb_list, log_list) {
+ if (sbi->flag & JFS_NOINTEGRITY)
+ continue;
filemap_fdatawait(sbi->ipbmap->i_mapping);
filemap_fdatawait(sbi->ipimap->i_mapping);
filemap_fdatawait(sbi->sb->s_bdev->bd_inode->i_mapping);
diff -Nru a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
--- a/fs/jfs/jfs_metapage.c 2005-01-02 23:12:03 -08:00
+++ b/fs/jfs/jfs_metapage.c 2005-01-02 23:12:03 -08:00
@@ -396,14 +396,6 @@
jfs_info("__write_metapage: mp = 0x%p", mp);
- if (test_bit(META_discard, &mp->flag)) {
- /*
- * This metadata is no longer valid
- */
- clear_bit(META_dirty, &mp->flag);
- return;
- }
-
page_index = mp->page->index;
page_offset =
(mp->index - (page_index << l2BlocksPerPage)) << l2bsize;
@@ -549,6 +541,7 @@
goto again;
}
+ clear_bit(META_dirty, &mp->flag);
set_bit(META_discard, &mp->flag);
spin_unlock(&meta_lock);
} else {
diff -Nru a/fs/jfs/xattr.c b/fs/jfs/xattr.c
--- a/fs/jfs/xattr.c 2005-01-02 23:12:03 -08:00
+++ b/fs/jfs/xattr.c 2005-01-02 23:12:03 -08:00
@@ -91,6 +91,12 @@
#define XATTR_OS2_PREFIX "os2."
#define XATTR_OS2_PREFIX_LEN (sizeof (XATTR_OS2_PREFIX) - 1)
+/* XATTR_SECURITY_PREFIX is defined in include/linux/xattr.h */
+#define XATTR_SECURITY_PREFIX_LEN (sizeof (XATTR_SECURITY_PREFIX) - 1)
+
+#define XATTR_TRUSTED_PREFIX "trusted."
+#define XATTR_TRUSTED_PREFIX_LEN (sizeof (XATTR_TRUSTED_PREFIX) - 1)
+
/*
* These three routines are used to recognize on-disk extended attributes
* that are in a recognized namespace. If the attribute is not recognized,
@@ -111,6 +117,19 @@
!strncmp(ea->name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
return FALSE;
/*
+ * Check for "security."
+ */
+ if ((ea->namelen >= XATTR_SECURITY_PREFIX_LEN) &&
+ !strncmp(ea->name, XATTR_SECURITY_PREFIX,
+ XATTR_SECURITY_PREFIX_LEN))
+ return FALSE;
+ /*
+ * Check for "trusted."
+ */
+ if ((ea->namelen >= XATTR_TRUSTED_PREFIX_LEN) &&
+ !strncmp(ea->name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN))
+ return FALSE;
+ /*
* Add any other valid namespace prefixes here
*/
@@ -770,6 +789,15 @@
*/
return can_set_system_xattr(inode, name, value, value_len);
+ if(strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN) != 0)
+ return (capable(CAP_SYS_ADMIN) ? 0 : -EPERM);
+
+#ifdef CONFIG_JFS_SECURITY
+ if (strncmp(name, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN)
+ != 0)
+ return 0; /* Leave it to the security module */
+#endif
+
if((strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) != 0) &&
(strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN) != 0))
return -EOPNOTSUPP;
@@ -937,8 +965,17 @@
static int can_get_xattr(struct inode *inode, const char *name)
{
+#ifdef CONFIG_JFS_SECURITY
+ if(strncmp(name, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN) == 0)
+ return 0;
+#endif
+
+ if(strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN) == 0)
+ return (capable(CAP_SYS_ADMIN) ? 0 : -EPERM);
+
if(strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN) == 0)
return 0;
+
return permission(inode, MAY_READ, NULL);
}
@@ -1021,6 +1058,16 @@
return err;
}
+/*
+ * No special permissions are needed to list attributes except for trusted.*
+ */
+static inline int can_list(struct jfs_ea *ea)
+{
+ return (strncmp(ea->name, XATTR_TRUSTED_PREFIX,
+ XATTR_TRUSTED_PREFIX_LEN) ||
+ capable(CAP_SYS_ADMIN));
+}
+
ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)
{
struct inode *inode = dentry->d_inode;
@@ -1045,8 +1092,10 @@
ealist = (struct jfs_ea_list *) ea_buf.xattr;
/* compute required size of list */
- for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea))
- size += name_size(ea) + 1;
+ for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea)) {
+ if (can_list(ea))
+ size += name_size(ea) + 1;
+ }
if (!data)
goto release;
@@ -1059,8 +1108,10 @@
/* Copy attribute names to buffer */
buffer = data;
for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea)) {
- int namelen = copy_name(buffer, ea);
- buffer += namelen + 1;
+ if (can_list(ea)) {
+ int namelen = copy_name(buffer, ea);
+ buffer += namelen + 1;
+ }
}
release: