Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb4bc1e0 authored by Yan's avatar Yan Committed by Chris Mason
Browse files

Btrfs: Fix compile on 2.6.22 kernel 



This patch fixes compile error on kernel-2.6.22

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent caaca38b

fs/btrfs/acl.c

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
#include <linux/posix_acl_xattr.h>

#include "ctree.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,

			       const void *value, size_t size)

{

fs/btrfs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -2322,15 +2322,16 @@ static int create_snapshot(struct btrfs_root *root, char *name, int namelen) 
		ret = -ENOMEM;

		goto fail_unlock;

	}

	pending_snapshot->name = kstrndup(name, namelen, GFP_NOFS);

	pending_snapshot->name = kmalloc(namelen + 1, GFP_NOFS);

	if (!pending_snapshot->name) {

		ret = -ENOMEM;

		kfree(pending_snapshot);

		goto fail_unlock;

	}

	memcpy(pending_snapshot->name, name, namelen);

	pending_snapshot->name[namelen] = '\0';

	trans = btrfs_start_transaction(root, 1);

	BUG_ON(!trans);



	pending_snapshot->root = root;

	list_add(&pending_snapshot->list,

		 &trans->transaction->pending_snapshots);