OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Btrfs: Fix compile on 2.6.22 kernel 

This patch fixes compile error on kernel-2.6.22

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Yan 2008-01-17 11:59:51 -05:00 committed by Chris Mason
parent caaca38b8f
commit fb4bc1e056
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/acl.c
View File

@ -22,6 +22,11 @@
#include <linux/posix_acl_xattr.h> #include <linux/posix_acl_xattr.h>
#include "ctree.h" #include "ctree.h"
#include "xattr.h" #include "xattr.h"
#ifndef is_owner_or_cap
#define is_owner_or_cap(inode) \
((current->fsuid == (inode)->i_uid) || capable(CAP_FOWNER))
#endif
static int btrfs_xattr_set_acl(struct inode *inode, int type, static int btrfs_xattr_set_acl(struct inode *inode, int type,
const void *value, size_t size) const void *value, size_t size)
{ {

5
fs/btrfs/inode.c
View File

@ -2322,15 +2322,16 @@ static int create_snapshot(struct btrfs_root *root, char *name, int namelen)
ret = -ENOMEM; ret = -ENOMEM;
goto fail_unlock; goto fail_unlock;
} }
pending_snapshot->name = kstrndup(name, namelen, GFP_NOFS); pending_snapshot->name = kmalloc(namelen + 1, GFP_NOFS);
if (!pending_snapshot->name) { if (!pending_snapshot->name) {
ret = -ENOMEM; ret = -ENOMEM;
kfree(pending_snapshot); kfree(pending_snapshot);
goto fail_unlock; goto fail_unlock;
} }
memcpy(pending_snapshot->name, name, namelen);
pending_snapshot->name[namelen] = '\0';
trans = btrfs_start_transaction(root, 1); trans = btrfs_start_transaction(root, 1);
BUG_ON(!trans); BUG_ON(!trans);
pending_snapshot->root = root; pending_snapshot->root = root;
list_add(&pending_snapshot->list, list_add(&pending_snapshot->list,
&trans->transaction->pending_snapshots); &trans->transaction->pending_snapshots);