git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for...
[pandora-kernel.git]
/
fs
/
ext3
/
acl.c
diff --git
a/fs/ext3/acl.c
b/fs/ext3/acl.c
index
3ac3826
..
0d21d55
100644
(file)
--- a/
fs/ext3/acl.c
+++ b/
fs/ext3/acl.c
@@
-7,6
+7,7
@@
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/slab.h>
+#include <linux/capability.h>
#include <linux/fs.h>
#include <linux/ext3_jbd.h>
#include <linux/ext3_fs.h>
#include <linux/fs.h>
#include <linux/ext3_jbd.h>
#include <linux/ext3_fs.h>
@@
-152,7
+153,7
@@
ext3_iset_acl(struct inode *inode, struct posix_acl **i_acl,
/*
* Inode operation get_posix_acl().
*
/*
* Inode operation get_posix_acl().
*
- * inode->i_
sem
: don't care
+ * inode->i_
mutex
: don't care
*/
static struct posix_acl *
ext3_get_acl(struct inode *inode, int type)
*/
static struct posix_acl *
ext3_get_acl(struct inode *inode, int type)
@@
-216,7
+217,7
@@
ext3_get_acl(struct inode *inode, int type)
/*
* Set the access or default ACL of an inode.
*
/*
* Set the access or default ACL of an inode.
*
- * inode->i_
sem
: down unless called from ext3_new_inode
+ * inode->i_
mutex
: down unless called from ext3_new_inode
*/
static int
ext3_set_acl(handle_t *handle, struct inode *inode, int type,
*/
static int
ext3_set_acl(handle_t *handle, struct inode *inode, int type,
@@
-225,7
+226,7
@@
ext3_set_acl(handle_t *handle, struct inode *inode, int type,
struct ext3_inode_info *ei = EXT3_I(inode);
int name_index;
void *value = NULL;
struct ext3_inode_info *ei = EXT3_I(inode);
int name_index;
void *value = NULL;
- size_t size;
+ size_t size
= 0
;
int error;
if (S_ISLNK(inode->i_mode))
int error;
if (S_ISLNK(inode->i_mode))
@@
-306,8
+307,8
@@
ext3_permission(struct inode *inode, int mask, struct nameidata *nd)
/*
* Initialize the ACLs of a new inode. Called from ext3_new_inode.
*
/*
* Initialize the ACLs of a new inode. Called from ext3_new_inode.
*
- * dir->i_
sem
: down
- * inode->i_
sem
: up (access to inode is still exclusive)
+ * dir->i_
mutex
: down
+ * inode->i_
mutex
: up (access to inode is still exclusive)
*/
int
ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
*/
int
ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
@@
-368,7
+369,7
@@
cleanup:
* for directories) are added. There are no more bits available in the
* file mode.
*
* for directories) are added. There are no more bits available in the
* file mode.
*
- * inode->i_
sem
: down
+ * inode->i_
mutex
: down
*/
int
ext3_acl_chmod(struct inode *inode)
*/
int
ext3_acl_chmod(struct inode *inode)