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

Commit ef38ff9d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw 

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (49 commits)
  [GFS2] fix assertion in log_refund()
  [GFS2] fix GFP_KERNEL misuses
  [GFS2] test for IS_ERR rather than 0
  [GFS2] Invalidate cache at correct point
  [GFS2] fs/gfs2/recovery.c: suppress warnings
  [GFS2] Faster gfs2_bitfit algorithm
  [GFS2] Streamline quota lock/check for no-quota case
  [GFS2] Remove drop of module ref where not needed
  [GFS2] gfs2_adjust_quota has broken unstuffing code
  [GFS2] possible null pointer dereference fixup
  [GFS2] Need to ensure that sector_t is 64bits for GFS2
  [GFS2] re-support special inode
  [GFS2] remove gfs2_dev_iops
  [GFS2] fix file_system_type leak on gfs2meta mount
  [GFS2] Allow bmap to allocate extents
  [GFS2] Fix a page lock / glock deadlock
  [GFS2] proper extern for gfs2/locking/dlm/mount.c:gdlm_ops
  [GFS2] gfs2/ops_file.c should #include "ops_inode.h"
  [GFS2] be*_add_cpu conversion
  [GFS2] Fix bug where we called drop_bh incorrectly
  ...
parents fda31d7d 62be1f71

fs/gfs2/Kconfig

+1 −1
Original line number Original line Diff line number Diff line 
config GFS2_FS

config GFS2_FS

	tristate "GFS2 file system support"

	tristate "GFS2 file system support"

	depends on EXPERIMENTAL

	depends on EXPERIMENTAL && (64BIT || (LSF && LBD))

	select FS_POSIX_ACL

	select FS_POSIX_ACL

	select CRC32

	select CRC32

	help

	help

fs/gfs2/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_GFS2_FS) += gfs2.o

obj-$(CONFIG_GFS2_FS) += gfs2.o

gfs2-y := acl.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \

gfs2-y := acl.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \

	glops.o inode.o lm.o log.o lops.o locking.o main.o meta_io.o \

	glops.o inode.o log.o lops.o locking.o main.o meta_io.o \

	mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \

	mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \

	ops_fstype.o ops_inode.o ops_super.o quota.o \

	ops_fstype.o ops_inode.o ops_super.o quota.o \

	recovery.o rgrp.o super.o sys.o trans.o util.o

	recovery.o rgrp.o super.o sys.o trans.o util.o

fs/gfs2/acl.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -116,7 +116,7 @@ static int acl_get(struct gfs2_inode *ip, int access, struct posix_acl **acl, 
		goto out;

		goto out;





	er.er_data_len = GFS2_EA_DATA_LEN(el->el_ea);

	er.er_data_len = GFS2_EA_DATA_LEN(el->el_ea);

	er.er_data = kmalloc(er.er_data_len, GFP_KERNEL);

	er.er_data = kmalloc(er.er_data_len, GFP_NOFS);

	error = -ENOMEM;

	error = -ENOMEM;

	if (!er.er_data)

	if (!er.er_data)

		goto out;

		goto out;
@@ -222,7 +222,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip) 
		return error;

		return error;

	}

	}





	clone = posix_acl_clone(acl, GFP_KERNEL);

	clone = posix_acl_clone(acl, GFP_NOFS);

	error = -ENOMEM;

	error = -ENOMEM;

	if (!clone)

	if (!clone)

		goto out;

		goto out;
@@ -272,7 +272,7 @@ int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr) 
	if (!acl)

	if (!acl)

		return gfs2_setattr_simple(ip, attr);

		return gfs2_setattr_simple(ip, attr);





	clone = posix_acl_clone(acl, GFP_KERNEL);

	clone = posix_acl_clone(acl, GFP_NOFS);

	error = -ENOMEM;

	error = -ENOMEM;

	if (!clone)

	if (!clone)

		goto out;

		goto out;