summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorNiv Sardi <xaiki@debian.org>2008-11-07 05:07:12 +0100
committerNiv Sardi <xaiki@debian.org>2008-11-07 05:07:12 +0100
commitdcd7b4e5c0649b1d2219399529b20de1df517e55 (patch)
treeef00739e48ddda0a30061d62a7348ed4b0c9aeeb /kernel
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentCRED: Wrap task credential accesses in the XFS filesystem (diff)
downloadlinux-dcd7b4e5c0649b1d2219399529b20de1df517e55.tar.xz
linux-dcd7b4e5c0649b1d2219399529b20de1df517e55.zip
Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl_check.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index c35da23ab8fb..fafeb48f27c0 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -730,7 +730,6 @@ static const struct trans_ctl_table trans_fs_quota_table[] = {
};
static const struct trans_ctl_table trans_fs_xfs_table[] = {
- { XFS_RESTRICT_CHOWN, "restrict_chown" },
{ XFS_SGID_INHERIT, "irix_sgid_inherit" },
{ XFS_SYMLINK_MODE, "irix_symlink_mode" },
{ XFS_PANIC_MASK, "panic_mask" },