diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-14 05:02:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-14 05:02:30 +0300 |
| commit | 5d2eb548b309be34ecf3b91f0b7300a2b9d09b8c (patch) | |
| tree | 89ce62fe154e6f10a018abb67f5f09015dd394fc /fs/ubifs/super.c | |
| parent | 2870f6c4d136e093e22159b8916918ff42c92218 (diff) | |
| parent | 29608d208b3619b3b508a6871622db789611d8a3 (diff) | |
| download | linux-5d2eb548b309be34ecf3b91f0b7300a2b9d09b8c.tar.xz | |
Merge branch 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs xattr cleanups from Al Viro.
* 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
f2fs: xattr simplifications
squashfs: xattr simplifications
9p: xattr simplifications
xattr handlers: Pass handler to operations instead of flags
jffs2: Add missing capability check for listing trusted xattrs
hfsplus: Remove unused xattr handler list operations
ubifs: Remove unused security xattr handler
vfs: Fix the posix_acl_xattr_list return value
vfs: Check attribute names in posix acl xattr handers
Diffstat (limited to 'fs/ubifs/super.c')
| -rw-r--r-- | fs/ubifs/super.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 8ee3133dd8e4..1fd90c079537 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2040,7 +2040,6 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) if (c->max_inode_sz > MAX_LFS_FILESIZE) sb->s_maxbytes = c->max_inode_sz = MAX_LFS_FILESIZE; sb->s_op = &ubifs_super_operations; - sb->s_xattr = ubifs_xattr_handlers; mutex_lock(&c->umount_mutex); err = mount_ubifs(c); |