xfs: increase the maximum number of supported ACL entries

With big installation current 25 maximum number of
supported ACL entries is not enough any more.
Increase the limit to 100.

Signed-off-by:

xfs: increase the maximum number of supported ACL entries

With big installation current 25 maximum number of
supported ACL entries is not enough any more.
Increase the limit to 100.

Signed-off-by: Felix Blyakher <felixb@sgi.com>

show more ...

Merge commit 'v2.6.29' into x86/setup-lzma

Merge branch 'x86/core' into cpus4096

Merge branch 'topic/vmaster-update' into topic/docbook-fix

Merge commit 'v2.6.29-rc7' into next

Merge branch 'topic/hwdep-cleanup' into topic/hdsp

Merge branch 'linus' into timers/hpet

Merge branch 'linus' into core/softlockup

Merge commit 'v2.6.29-rc4' into x86/cleanups

Merge branch 'topic/quirk-cleanup' into topic/hda

Merge branches 'sched/rt' and 'sched/urgent' into sched/core

Merge branch 'linus' into core/locking

Conflicts:
fs/btrfs/locking.c

Merge branch 'master' into next

Conflicts:
fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ stat

Merge branch 'master' into next

Conflicts:
fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
nd->flags |= LOOKUP_CONTINUE;
err = exec_permission_lite(inode);
if (err == -EAGAIN)
- err = vfs_permission(nd, MAY_EXEC);
+ err = inode_permission(nd->path.dentry->d_inode,
+ MAY_EXEC);
+ if (!err)
+ err = ima_path_check(&nd->path, MAY_EXEC);
if (err)
break;

@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
flag &= ~O_TRUNC;
}

- error = vfs_permission(nd, acc_mode);
+ error = inode_permission(inode, acc_mode);
if (error)
return error;
+
- error = ima_path_check(&nd->path,
++ error = ima_path_check(path,
+ acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
+ if (error)
+ return error;
/*
* An append-only file must be opened in append mode for writing.
*/

Signed-off-by: James Morris <jmorris@namei.org>

show more ...

Merge branch 'core/xen' into x86/urgent

Merge branch 'master' of /home/shaggy/git/linus-clean/

Merge branch 'linus' into timers/hrtimers

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

Merge branch 'core/debugobjects' into core/urgent

Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
include/linux/syscalls.h

Merge branch 'x86/mm' into core/percpu

Conflicts:
arch/x86/mm/fault.c

Merge commit 'v2.6.29-rc2' into x86/mm

Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core

Merge branch 'linus' into irq/genirq

Merge branch 'linus' into core/iommu

Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
[XFS] Update maintainers
[XFS] use scalable vmap API
[XFS] remove old vmap cache
[XFS] make

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
[XFS] Update maintainers
[XFS] use scalable vmap API
[XFS] remove old vmap cache
[XFS] make xfs_ino_t an unsigned long long
[XFS] truncate readdir offsets to signed 32 bit values
[XFS] fix compile of xfs_btree_readahead_lblock on m68k
[XFS] Remove macro-to-function indirections in the mask code
[XFS] Remove macro-to-function indirections in attr code
[XFS] Remove several unused typedefs.
[XFS] pass XFS_IGET_BULKSTAT to xfs_iget for handle operations

show more ...