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

Commit ca4d147e authored by Herbert Poetzl's avatar Herbert Poetzl Committed by Mark Fasheh
Browse files

ocfs2: add ext2 attributes 



Support immutable, and other attributes.

Some renaming and other minor fixes done by myself.

Signed-off-by: default avatarHerbert Poetzl <herbert@13thfloor.at>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent b4c98f62

fs/ocfs2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ ocfs2-objs := \ 
	file.o 			\

	heartbeat.o 		\

	inode.o 		\

	ioctl.o 		\

	journal.o 		\

	localalloc.o 		\

	mmap.o 			\

fs/ocfs2/dlmglue.c

+7 −2
Original line number Diff line number Diff line
@@ -1330,6 +1330,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode) 
		cpu_to_be64(ocfs2_pack_timespec(&inode->i_ctime));

	lvb->lvb_imtime_packed =

		cpu_to_be64(ocfs2_pack_timespec(&inode->i_mtime));

	lvb->lvb_iattr    = cpu_to_be32(oi->ip_attr);



	mlog_meta_lvb(0, lockres);
@@ -1360,6 +1361,9 @@ static void ocfs2_refresh_inode_from_lvb(struct inode *inode) 
	oi->ip_clusters = be32_to_cpu(lvb->lvb_iclusters);

	i_size_write(inode, be64_to_cpu(lvb->lvb_isize));



	oi->ip_attr = be32_to_cpu(lvb->lvb_iattr);

	ocfs2_set_inode_flags(inode);



	/* fast-symlinks are a special case */

	if (S_ISLNK(inode->i_mode) && !oi->ip_clusters)

		inode->i_blocks = 0;
@@ -2899,8 +2903,9 @@ void ocfs2_dump_meta_lvb_info(u64 level, 
	     be32_to_cpu(lvb->lvb_iuid), be32_to_cpu(lvb->lvb_igid),

	     be16_to_cpu(lvb->lvb_imode));

	mlog(level, "nlink %u, atime_packed 0x%llx, ctime_packed 0x%llx, "

	     "mtime_packed 0x%llx\n", be16_to_cpu(lvb->lvb_inlink),

	     "mtime_packed 0x%llx iattr 0x%x\n", be16_to_cpu(lvb->lvb_inlink),

	     (long long)be64_to_cpu(lvb->lvb_iatime_packed),

	     (long long)be64_to_cpu(lvb->lvb_ictime_packed),

	     (long long)be64_to_cpu(lvb->lvb_imtime_packed));

	     (long long)be64_to_cpu(lvb->lvb_imtime_packed),

	     be32_to_cpu(lvb->lvb_iattr));

}

fs/ocfs2/dlmglue.h

+3 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#ifndef DLMGLUE_H

#define DLMGLUE_H



#define OCFS2_LVB_VERSION 2

#define OCFS2_LVB_VERSION 3



struct ocfs2_meta_lvb {

	__be32       lvb_version;
@@ -40,7 +40,8 @@ struct ocfs2_meta_lvb { 
	__be64       lvb_isize;

	__be16       lvb_imode;

	__be16       lvb_inlink;

	__be32       lvb_reserved[3];

	__be32       lvb_iattr;

	__be32       lvb_reserved[2];

};



/* ocfs2_meta_lock_full() and ocfs2_data_lock_full() 'arg_flags' flags */

fs/ocfs2/file.c

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "file.h"

#include "sysfile.h"

#include "inode.h"

#include "ioctl.h"

#include "journal.h"

#include "mmap.h"

#include "suballoc.h"
@@ -1227,10 +1228,12 @@ const struct file_operations ocfs2_fops = { 
	.open		= ocfs2_file_open,

	.aio_read	= ocfs2_file_aio_read,

	.aio_write	= ocfs2_file_aio_write,

	.ioctl		= ocfs2_ioctl,

};



const struct file_operations ocfs2_dops = {

	.read		= generic_read_dir,

	.readdir	= ocfs2_readdir,

	.fsync		= ocfs2_sync_file,

	.ioctl		= ocfs2_ioctl,

};

fs/ocfs2/inode.c

+27 −1
Original line number Diff line number Diff line
@@ -71,6 +71,26 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, 
				    struct inode *inode,

				    struct buffer_head *fe_bh);



void ocfs2_set_inode_flags(struct inode *inode)

{

	unsigned int flags = OCFS2_I(inode)->ip_attr;



	inode->i_flags &= ~(S_IMMUTABLE |

		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);



	if (flags & OCFS2_IMMUTABLE_FL)

		inode->i_flags |= S_IMMUTABLE;



	if (flags & OCFS2_SYNC_FL)

		inode->i_flags |= S_SYNC;

	if (flags & OCFS2_APPEND_FL)

		inode->i_flags |= S_APPEND;

	if (flags & OCFS2_NOATIME_FL)

		inode->i_flags |= S_NOATIME;

	if (flags & OCFS2_DIRSYNC_FL)

		inode->i_flags |= S_DIRSYNC;

}



struct inode *ocfs2_ilookup_for_vote(struct ocfs2_super *osb,

				     u64 blkno,

				     int delete_vote)
@@ -260,7 +280,6 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, 
		inode->i_blocks =

			ocfs2_align_bytes_to_sectors(le64_to_cpu(fe->i_size));

	inode->i_mapping->a_ops = &ocfs2_aops;

	inode->i_flags |= S_NOATIME;

	inode->i_atime.tv_sec = le64_to_cpu(fe->i_atime);

	inode->i_atime.tv_nsec = le32_to_cpu(fe->i_atime_nsec);

	inode->i_mtime.tv_sec = le64_to_cpu(fe->i_mtime);
@@ -276,6 +295,7 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, 


	OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters);

	OCFS2_I(inode)->ip_orphaned_slot = OCFS2_INVALID_SLOT;

	OCFS2_I(inode)->ip_attr = le32_to_cpu(fe->i_attr);



	if (create_ino)

		inode->i_ino = ino_from_blkno(inode->i_sb,
@@ -330,6 +350,9 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, 
	ocfs2_inode_lock_res_init(&OCFS2_I(inode)->ip_data_lockres,

				  OCFS2_LOCK_TYPE_DATA, inode);



	ocfs2_set_inode_flags(inode);

	inode->i_flags |= S_NOATIME;



	status = 0;

bail:

	mlog_exit(status);
@@ -1131,6 +1154,7 @@ int ocfs2_mark_inode_dirty(struct ocfs2_journal_handle *handle, 


	spin_lock(&OCFS2_I(inode)->ip_lock);

	fe->i_clusters = cpu_to_le32(OCFS2_I(inode)->ip_clusters);

	fe->i_attr = cpu_to_le32(OCFS2_I(inode)->ip_attr);

	spin_unlock(&OCFS2_I(inode)->ip_lock);



	fe->i_size = cpu_to_le64(i_size_read(inode));
@@ -1169,6 +1193,8 @@ void ocfs2_refresh_inode(struct inode *inode, 
	spin_lock(&OCFS2_I(inode)->ip_lock);



	OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters);

	OCFS2_I(inode)->ip_attr = le32_to_cpu(fe->i_attr);

	ocfs2_set_inode_flags(inode);

	i_size_write(inode, le64_to_cpu(fe->i_size));

	inode->i_nlink = le16_to_cpu(fe->i_links_count);

	inode->i_uid = le32_to_cpu(fe->i_uid);