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

Commit 18062a91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: Fix race waking up jfsIO kernel thread
  JFS: use __set_current_state()
  Copy i_flags to jfs inode flags on write
  JFS: document uid, gid, and umask mount options in jfs.txt
parents be3478dd 05ec9e26

Documentation/filesystems/jfs.txt

+7 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,13 @@ errors=continue Keep going on a filesystem error. 
errors=remount-ro	Default. Remount the filesystem read-only on an error.

errors=remount-ro	Default. Remount the filesystem read-only on an error.

errors=panic		Panic and halt the machine if an error occurs.

errors=panic		Panic and halt the machine if an error occurs.





Please send bugs, comments, cards and letters to shaggy@austin.ibm.com.

uid=value	Override on-disk uid with specified value

gid=value	Override on-disk gid with specified value

umask=value	Override on-disk umask with specified octal value.  For

		directories, the execute bit will be set if the corresponding

		read bit is set.



Please send bugs, comments, cards and letters to shaggy@linux.vnet.ibm.com.





The JFS mailing list can be subscribed to by using the link labeled

The JFS mailing list can be subscribed to by using the link labeled

"Mail list Subscribe" at our web page http://jfs.sourceforge.net/
 
"Mail list Subscribe" at our web page http://jfs.sourceforge.net/

fs/jfs/inode.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,6 @@ void jfs_read_inode(struct inode *inode) 
		inode->i_op = &jfs_file_inode_operations;

		inode->i_op = &jfs_file_inode_operations;

		init_special_inode(inode, inode->i_mode, inode->i_rdev);

		init_special_inode(inode, inode->i_mode, inode->i_rdev);

	}

	}

	jfs_set_inode_flags(inode);

}

}





/*

/*

fs/jfs/ioctl.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, 




	switch (cmd) {

	switch (cmd) {

	case JFS_IOC_GETFLAGS:

	case JFS_IOC_GETFLAGS:

		jfs_get_inode_flags(jfs_inode);

		flags = jfs_inode->mode2 & JFS_FL_USER_VISIBLE;

		flags = jfs_inode->mode2 & JFS_FL_USER_VISIBLE;

		flags = jfs_map_ext2(flags, 0);

		flags = jfs_map_ext2(flags, 0);

		return put_user(flags, (int __user *) arg);

		return put_user(flags, (int __user *) arg);
@@ -78,6 +79,7 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, 
		if (!S_ISDIR(inode->i_mode))

		if (!S_ISDIR(inode->i_mode))

			flags &= ~JFS_DIRSYNC_FL;

			flags &= ~JFS_DIRSYNC_FL;





		jfs_get_inode_flags(jfs_inode);

		oldflags = jfs_inode->mode2;

		oldflags = jfs_inode->mode2;





		/*

		/*

fs/jfs/jfs_imap.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -3078,6 +3078,7 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip) 




	jfs_ip->fileset = le32_to_cpu(dip->di_fileset);

	jfs_ip->fileset = le32_to_cpu(dip->di_fileset);

	jfs_ip->mode2 = le32_to_cpu(dip->di_mode);

	jfs_ip->mode2 = le32_to_cpu(dip->di_mode);

	jfs_set_inode_flags(ip);





	ip->i_mode = le32_to_cpu(dip->di_mode) & 0xffff;

	ip->i_mode = le32_to_cpu(dip->di_mode) & 0xffff;

	if (sbi->umask != -1) {

	if (sbi->umask != -1) {
@@ -3174,6 +3175,7 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip) 
		dip->di_gid = cpu_to_le32(ip->i_gid);

		dip->di_gid = cpu_to_le32(ip->i_gid);

	else

	else

		dip->di_gid = cpu_to_le32(jfs_ip->saved_gid);

		dip->di_gid = cpu_to_le32(jfs_ip->saved_gid);

	jfs_get_inode_flags(jfs_ip);

	/*

	/*

	 * mode2 is only needed for storing the higher order bits.

	 * mode2 is only needed for storing the higher order bits.

	 * Trust i_mode for the lower order ones

	 * Trust i_mode for the lower order ones

fs/jfs/jfs_inode.c

+18 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,24 @@ void jfs_set_inode_flags(struct inode *inode) 
		inode->i_flags |= S_SYNC;

		inode->i_flags |= S_SYNC;

}

}





void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)

{

	unsigned int flags = jfs_ip->vfs_inode.i_flags;



	jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |

			   JFS_DIRSYNC_FL | JFS_SYNC_FL);

	if (flags & S_IMMUTABLE)

		jfs_ip->mode2 |= JFS_IMMUTABLE_FL;

	if (flags & S_APPEND)

		jfs_ip->mode2 |= JFS_APPEND_FL;

	if (flags & S_NOATIME)

		jfs_ip->mode2 |= JFS_NOATIME_FL;

	if (flags & S_DIRSYNC)

		jfs_ip->mode2 |= JFS_DIRSYNC_FL;

	if (flags & S_SYNC)

		jfs_ip->mode2 |= JFS_SYNC_FL;

}



/*

/*

 * NAME:	ialloc()

 * NAME:	ialloc()

 *

 *