Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6 (dcd7b4e5) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/filesystems/xfs.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -229,10 +229,6 @@ The following sysctls are available for the XFS filesystem:
		ISGID bit is cleared if the irix_sgid_inherit compatibility sysctl
		is set.

		fs.xfs.restrict_chown (Min: 0 Default: 1 Max: 1)
		Controls whether unprivileged users can use chown to "give away"
		a file to another user.

		fs.xfs.inherit_sync (Min: 0 Default: 1 Max: 1)
		Setting this to "1" will cause the "sync" flag set
		by the xfs_io(8) chattr command on a directory to be

fs/inode.c

+125 −83

Original line number	Diff line number	Diff line
		@@ -108,19 +108,20 @@ static void wake_up_inode(struct inode *inode)
		wake_up_bit(&inode->i_state, __I_LOCK);
		}

		static struct inode alloc_inode(struct super_block sb)
		/**
		* inode_init_always - perform inode structure intialisation
		* @sb - superblock inode belongs to.
		* @inode - inode to initialise
		*
		* These are initializations that need to be done on every inode
		* allocation as the fields are not initialised by slab allocation.
		*/
		struct inode inode_init_always(struct super_block sb, struct inode *inode)
		{
		static const struct address_space_operations empty_aops;
		static struct inode_operations empty_iops;
		static const struct file_operations empty_fops;
		struct inode *inode;

		if (sb->s_op->alloc_inode)
		inode = sb->s_op->alloc_inode(sb);
		else
		inode = (struct inode *) kmem_cache_alloc(inode_cachep, GFP_KERNEL);

		if (inode) {
		struct address_space * const mapping = &inode->i_data;

		inode->i_sb = sb;
		@@ -183,9 +184,24 @@ static struct inode alloc_inode(struct super_block sb)
		}
		inode->i_private = NULL;
		inode->i_mapping = mapping;
		}

		return inode;
		}
		EXPORT_SYMBOL(inode_init_always);

		static struct inode alloc_inode(struct super_block sb)
		{
		struct inode *inode;

		if (sb->s_op->alloc_inode)
		inode = sb->s_op->alloc_inode(sb);
		else
		inode = kmem_cache_alloc(inode_cachep, GFP_KERNEL);

		if (inode)
		return inode_init_always(sb, inode);
		return NULL;
		}

		void destroy_inode(struct inode *inode)
		{
		@@ -196,6 +212,7 @@ void destroy_inode(struct inode *inode)
		else
		kmem_cache_free(inode_cachep, (inode));
		}
		EXPORT_SYMBOL(destroy_inode);


		/*
		@@ -534,6 +551,49 @@ static struct inode * find_inode_fast(struct super_block * sb, struct hlist_head
		return node ? inode : NULL;
		}

		static unsigned long hash(struct super_block *sb, unsigned long hashval)
		{
		unsigned long tmp;

		tmp = (hashval * (unsigned long)sb) ^ (GOLDEN_RATIO_PRIME + hashval) /
		L1_CACHE_BYTES;
		tmp = tmp ^ ((tmp ^ GOLDEN_RATIO_PRIME) >> I_HASHBITS);
		return tmp & I_HASHMASK;
		}

		static inline void
		__inode_add_to_lists(struct super_block sb, struct hlist_head head,
		struct inode *inode)
		{
		inodes_stat.nr_inodes++;
		list_add(&inode->i_list, &inode_in_use);
		list_add(&inode->i_sb_list, &sb->s_inodes);
		if (head)
		hlist_add_head(&inode->i_hash, head);
		}

		/**
		* inode_add_to_lists - add a new inode to relevant lists
		* @sb - superblock inode belongs to.
		* @inode - inode to mark in use
		*
		* When an inode is allocated it needs to be accounted for, added to the in use
		* list, the owning superblock and the inode hash. This needs to be done under
		* the inode_lock, so export a function to do this rather than the inode lock
		* itself. We calculate the hash list to add to here so it is all internal
		* which requires the caller to have already set up the inode number in the
		* inode to add.
		*/
		void inode_add_to_lists(struct super_block sb, struct inode inode)
		{
		struct hlist_head *head = inode_hashtable + hash(sb, inode->i_ino);

		spin_lock(&inode_lock);
		__inode_add_to_lists(sb, head, inode);
		spin_unlock(&inode_lock);
		}
		EXPORT_SYMBOL_GPL(inode_add_to_lists);

		/**
		* new_inode - obtain an inode
		* @sb: superblock
		@@ -561,9 +621,7 @@ struct inode new_inode(struct super_block sb)
		inode = alloc_inode(sb);
		if (inode) {
		spin_lock(&inode_lock);
		inodes_stat.nr_inodes++;
		list_add(&inode->i_list, &inode_in_use);
		list_add(&inode->i_sb_list, &sb->s_inodes);
		__inode_add_to_lists(sb, NULL, inode);
		inode->i_ino = ++last_ino;
		inode->i_state = 0;
		spin_unlock(&inode_lock);
		@@ -622,10 +680,7 @@ static struct inode * get_new_inode(struct super_block sb, struct hlist_head h
		if (set(inode, data))
		goto set_failed;

		inodes_stat.nr_inodes++;
		list_add(&inode->i_list, &inode_in_use);
		list_add(&inode->i_sb_list, &sb->s_inodes);
		hlist_add_head(&inode->i_hash, head);
		__inode_add_to_lists(sb, head, inode);
		inode->i_state = I_LOCK\|I_NEW;
		spin_unlock(&inode_lock);

		@@ -671,10 +726,7 @@ static struct inode * get_new_inode_fast(struct super_block *sb, struct hlist_he
		old = find_inode_fast(sb, head, ino);
		if (!old) {
		inode->i_ino = ino;
		inodes_stat.nr_inodes++;
		list_add(&inode->i_list, &inode_in_use);
		list_add(&inode->i_sb_list, &sb->s_inodes);
		hlist_add_head(&inode->i_hash, head);
		__inode_add_to_lists(sb, head, inode);
		inode->i_state = I_LOCK\|I_NEW;
		spin_unlock(&inode_lock);

		@@ -698,16 +750,6 @@ static struct inode * get_new_inode_fast(struct super_block *sb, struct hlist_he
		return inode;
		}

		static unsigned long hash(struct super_block *sb, unsigned long hashval)
		{
		unsigned long tmp;

		tmp = (hashval * (unsigned long)sb) ^ (GOLDEN_RATIO_PRIME + hashval) /
		L1_CACHE_BYTES;
		tmp = tmp ^ ((tmp ^ GOLDEN_RATIO_PRIME) >> I_HASHBITS);
		return tmp & I_HASHMASK;
		}

		/**
		* iunique - get a unique inode number
		* @sb: superblock

fs/xfs/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,8 @@ xfs-y += xfs_alloc.o \
		xfs_dmops.o \
		xfs_qmops.o

		xfs-$(CONFIG_XFS_TRACE) += xfs_dir2_trace.o
		xfs-$(CONFIG_XFS_TRACE) += xfs_btree_trace.o \
		xfs_dir2_trace.o

		# Objects in linux/
		xfs-y += $(addprefix $(XFS_LINUX)/, \
		@@ -106,6 +107,7 @@ xfs-y += $(addprefix $(XFS_LINUX)/, \
		xfs_iops.o \
		xfs_lrw.o \
		xfs_super.o \
		xfs_sync.o \
		xfs_vnode.o \
		xfs_xattr.o)

fs/xfs/linux-2.6/xfs_aops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ xfs_setfilesize(
		ip->i_d.di_size = isize;
		ip->i_update_core = 1;
		ip->i_update_size = 1;
		mark_inode_dirty_sync(ioend->io_inode);
		xfs_mark_inode_dirty_sync(ip);
		}

		xfs_iunlock(ip, XFS_ILOCK_EXCL);

fs/xfs/linux-2.6/xfs_cred.h

+1 −9

Original line number	Diff line number	Diff line
		@@ -27,12 +27,4 @@ typedef struct cred {
		/* EMPTY */
		} cred_t;

		extern struct cred *sys_cred;

		/* this is a hack.. (assumes sys_cred is the only cred_t in the system) */
		static inline int capable_cred(cred_t *cr, int cid)
		{
		return (cr == sys_cred) ? 1 : capable(cid);
		}

		#endif /* __XFS_CRED_H__ */