diff options
author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 13:37:29 -0700 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 13:37:29 -0700 |
commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /fs/ubifs/xattr.c | |
parent | a36d515c7a2dfacebcf41729f6812dbc424ebcf0 (diff) | |
parent | a9743fcdc0eb43d028b71267438076e1b0112ba0 (diff) | |
download | linux-f9221fd80343285514568da6c5dbda0f87109de8.tar.gz linux-f9221fd80343285514568da6c5dbda0f87109de8.tar.bz2 linux-f9221fd80343285514568da6c5dbda0f87109de8.zip |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'fs/ubifs/xattr.c')
-rw-r--r-- | fs/ubifs/xattr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index 195830f47569..c74400f88fe0 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c @@ -56,6 +56,7 @@ */ #include "ubifs.h" +#include <linux/slab.h> #include <linux/xattr.h> #include <linux/posix_acl_xattr.h> |