summaryrefslogtreecommitdiffstats
path: root/fs/xattr.c
diff options
context:
space:
mode:
authorIngo Molnar2011-05-12 09:36:18 +0200
committerIngo Molnar2011-05-12 09:36:18 +0200
commit9cb5baba5e3acba0994ad899ee908799104c9965 (patch)
treed5ff16000256a0bf56279926e6114b4603ede2b4 /fs/xattr.c
parentsched: Shorten the construction of the span cpu mask of sched domain (diff)
parentLinux 2.6.39-rc7 (diff)
downloadkernel-qcow2-linux-9cb5baba5e3acba0994ad899ee908799104c9965.tar.gz
kernel-qcow2-linux-9cb5baba5e3acba0994ad899ee908799104c9965.tar.xz
kernel-qcow2-linux-9cb5baba5e3acba0994ad899ee908799104c9965.zip
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'fs/xattr.c')
-rw-r--r--fs/xattr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xattr.c b/fs/xattr.c
index a19acdb81cd1..f1ef94974dea 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -666,7 +666,7 @@ generic_setxattr(struct dentry *dentry, const char *name, const void *value, siz
handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name);
if (!handler)
return -EOPNOTSUPP;
- return handler->set(dentry, name, value, size, 0, handler->flags);
+ return handler->set(dentry, name, value, size, flags, handler->flags);
}
/*