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

Commit 677abe49 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:
  GFS2: Fix typo
  GFS2: stuck in inode wait, no glocks stuck
  GFS2: Eliminate useless err variable
  GFS2: Fix writing to non-page aligned gfs2_quota structures
  GFS2: Add some useful messages
  GFS2: fix quota state reporting
  GFS2: Various gfs2_logd improvements
  GFS2: glock livelock
  GFS2: Clean up stuffed file copying
  GFS2: docs update
  GFS2: Remove space from slab cache name
parents e90e4d92 6a99be5d

Documentation/filesystems/gfs2.txt

+6 −6
Original line number Diff line number Diff line 
Global File System

------------------



http://sources.redhat.com/cluster/

http://sources.redhat.com/cluster/wiki/



GFS is a cluster file system. It allows a cluster of computers to

simultaneously use a block device that is shared between them (with FC,

fs/gfs2/aops.c

+5 −3
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ static int gfs2_jdata_writepages(struct address_space *mapping, 
static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)

{

	struct buffer_head *dibh;

	u64 dsize = i_size_read(&ip->i_inode);

	void *kaddr;

	int error;
@@ -437,9 +438,10 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) 
		return error;



	kaddr = kmap_atomic(page, KM_USER0);

	memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode),

	       ip->i_disksize);

	memset(kaddr + ip->i_disksize, 0, PAGE_CACHE_SIZE - ip->i_disksize);

	if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode)))

		dsize = (dibh->b_size - sizeof(struct gfs2_dinode));

	memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);

	memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize);

	kunmap_atomic(kaddr, KM_USER0);

	flush_dcache_page(page);

	brelse(dibh);

fs/gfs2/bmap.c

+10 −7
Original line number Diff line number Diff line
@@ -71,11 +71,13 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, 


	if (!PageUptodate(page)) {

		void *kaddr = kmap(page);

		u64 dsize = i_size_read(inode);

 

		memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode),

		       ip->i_disksize);

		memset(kaddr + ip->i_disksize, 0,

		       PAGE_CACHE_SIZE - ip->i_disksize);

		if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode)))

			dsize = dibh->b_size - sizeof(struct gfs2_dinode);



		memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);

		memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize);

		kunmap(page);



		SetPageUptodate(page);
@@ -1038,13 +1040,14 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 
		goto out;



	if (gfs2_is_stuffed(ip)) {

		ip->i_disksize = size;

		u64 dsize = size + sizeof(struct gfs2_inode);

		ip->i_inode.i_mtime = ip->i_inode.i_ctime = CURRENT_TIME;

		gfs2_trans_add_bh(ip->i_gl, dibh, 1);

		gfs2_dinode_out(ip, dibh->b_data);

		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode) + size);

		if (dsize > dibh->b_size)

			dsize = dibh->b_size;

		gfs2_buffer_clear_tail(dibh, dsize);

		error = 1;



	} else {

		if (size & (u64)(sdp->sd_sb.sb_bsize - 1))

			error = gfs2_block_truncate_page(ip->i_inode.i_mapping);

fs/gfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name) 
		inode = gfs2_inode_lookup(dir->i_sb, 

				be16_to_cpu(dent->de_type),

				be64_to_cpu(dent->de_inum.no_addr),

				be64_to_cpu(dent->de_inum.no_formal_ino), 0);

				be64_to_cpu(dent->de_inum.no_formal_ino));

		brelse(bh);

		return inode;

	}

fs/gfs2/export.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static struct dentry *gfs2_get_dentry(struct super_block *sb, 
	if (error)

		goto fail;



	inode = gfs2_inode_lookup(sb, DT_UNKNOWN, inum->no_addr, 0, 0);

	inode = gfs2_inode_lookup(sb, DT_UNKNOWN, inum->no_addr, 0);

	if (IS_ERR(inode)) {

		error = PTR_ERR(inode);

		goto fail;