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

Commit 79ecb043 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Use MAX_LFS_FILESIZE for meta inode size
  GFS2: Fix gfs2_xattr_acl_chmod()
  GFS2: Fix locking bug in rename
  GFS2: Ensure uptodate inode size when using O_APPEND
parents db1fc957 ba198098

fs/gfs2/file.c

+36 −2
Original line number Diff line number Diff line
@@ -569,6 +569,40 @@ static int gfs2_fsync(struct file *file, struct dentry *dentry, int datasync) 
	return ret;

}



/**

 * gfs2_file_aio_write - Perform a write to a file

 * @iocb: The io context

 * @iov: The data to write

 * @nr_segs: Number of @iov segments

 * @pos: The file position

 *

 * We have to do a lock/unlock here to refresh the inode size for

 * O_APPEND writes, otherwise we can land up writing at the wrong

 * offset. There is still a race, but provided the app is using its

 * own file locking, this will make O_APPEND work as expected.

 *

 */



static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov,

				   unsigned long nr_segs, loff_t pos)

{

	struct file *file = iocb->ki_filp;



	if (file->f_flags & O_APPEND) {

		struct dentry *dentry = file->f_dentry;

		struct gfs2_inode *ip = GFS2_I(dentry->d_inode);

		struct gfs2_holder gh;

		int ret;



		ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &gh);

		if (ret)

			return ret;

		gfs2_glock_dq_uninit(&gh);

	}



	return generic_file_aio_write(iocb, iov, nr_segs, pos);

}



#ifdef CONFIG_GFS2_FS_LOCKING_DLM



/**
@@ -711,7 +745,7 @@ const struct file_operations gfs2_file_fops = { 
	.read		= do_sync_read,

	.aio_read	= generic_file_aio_read,

	.write		= do_sync_write,

	.aio_write	= generic_file_aio_write,

	.aio_write	= gfs2_file_aio_write,

	.unlocked_ioctl	= gfs2_ioctl,

	.mmap		= gfs2_mmap,

	.open		= gfs2_open,
@@ -741,7 +775,7 @@ const struct file_operations gfs2_file_fops_nolock = { 
	.read		= do_sync_read,

	.aio_read	= generic_file_aio_read,

	.write		= do_sync_write,

	.aio_write	= generic_file_aio_write,

	.aio_write	= gfs2_file_aio_write,

	.unlocked_ioctl	= gfs2_ioctl,

	.mmap		= gfs2_mmap,

	.open		= gfs2_open,

fs/gfs2/meta_io.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp) 
	if (aspace) {

		mapping_set_gfp_mask(aspace->i_mapping, GFP_NOFS);

		aspace->i_mapping->a_ops = &aspace_aops;

		aspace->i_size = ~0ULL;

		aspace->i_size = MAX_LFS_FILESIZE;

		ip = GFS2_I(aspace);

		clear_bit(GIF_USER, &ip->i_flags);

		insert_inode_hash(aspace);

fs/gfs2/ops_inode.c

+4 −2
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
	struct gfs2_rgrpd *nrgd;

	unsigned int num_gh;

	int dir_rename = 0;

	int alloc_required;

	int alloc_required = 0;

	unsigned int x;

	int error;
@@ -867,7 +867,9 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
			goto out_gunlock;

	}



	alloc_required = error = gfs2_diradd_alloc_required(ndir, &ndentry->d_name);

	if (nip == NULL)

		alloc_required = gfs2_diradd_alloc_required(ndir, &ndentry->d_name);

	error = alloc_required;

	if (error < 0)

		goto out_gunlock;

	error = 0;

fs/gfs2/xattr.c

+11 −10
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ static int ea_acl_chmod_unstuffed(struct gfs2_inode *ip, 


int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct gfs2_ea_location el;

	struct buffer_head *dibh;

	int error;
@@ -1305,16 +1306,17 @@ int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data) 
		return error;



	if (GFS2_EA_IS_STUFFED(el.el_ea)) {

		error = gfs2_trans_begin(GFS2_SB(&ip->i_inode), RES_DINODE + RES_EATTR, 0);

		if (error)

			return error;



		error = gfs2_trans_begin(sdp, RES_DINODE + RES_EATTR, 0);

		if (error == 0) {

			gfs2_trans_add_bh(ip->i_gl, el.el_bh, 1);

			memcpy(GFS2_EA2DATA(el.el_ea), data,

			       GFS2_EA_DATA_LEN(el.el_ea));

	} else

		}

	} else {

		error = ea_acl_chmod_unstuffed(ip, el.el_ea, data);

	}



	brelse(el.el_bh);

	if (error)

		return error;
@@ -1327,8 +1329,7 @@ int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data) 
		brelse(dibh);

	}



	gfs2_trans_end(GFS2_SB(&ip->i_inode));



	gfs2_trans_end(sdp);

	return error;

}