Commit e1c50248 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'reiserfs-updates' from Jeff Mahoney 

* reiserfs-updates: (35 commits)
  reiserfs: rename [cn]_* variables
  reiserfs: rename p_._ variables
  reiserfs: rename p_s_tb to tb
  reiserfs: rename p_s_inode to inode
  reiserfs: rename p_s_bh to bh
  reiserfs: rename p_s_sb to sb
  reiserfs: strip trailing whitespace
  reiserfs: cleanup path functions
  reiserfs: factor out buffer_info initialization
  reiserfs: add atomic addition of selinux attributes during inode creation
  reiserfs: use generic readdir for operations across all xattrs
  reiserfs: journaled xattrs
  reiserfs: use generic xattr handlers
  reiserfs: remove i_has_xattr_dir
  reiserfs: make per-inode xattr locking more fine grained
  reiserfs: eliminate per-super xattr lock
  reiserfs: simplify xattr internal file lookups/opens
  reiserfs: Clean up xattrs when REISERFS_FS_XATTR is unset
  reiserfs: remove IS_PRIVATE helpers
  reiserfs: remove link detection code
  ...

Fixed up conflicts manually due to:
 - quota name cleanups vs variable naming changes:
	fs/reiserfs/inode.c
	fs/reiserfs/namei.c
	fs/reiserfs/stree.c
        fs/reiserfs/xattr.c
 - exported include header cleanups
	include/linux/reiserfs_fs.h
parents 019abbc8 ee93961b

fs/reiserfs/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ obj-$(CONFIG_REISERFS_FS) += reiserfs.o 
reiserfs-objs := bitmap.o do_balan.o namei.o inode.o file.o dir.o fix_node.o \

		 super.o prints.o objectid.o lbalance.o ibalance.o stree.o \

		 hashes.o tail_conversion.o journal.o resize.o \

		 item_ops.o ioctl.o procfs.o

		 item_ops.o ioctl.o procfs.o xattr.o



ifeq ($(CONFIG_REISERFS_FS_XATTR),y)

reiserfs-objs += xattr.o xattr_user.o xattr_trusted.o

reiserfs-objs += xattr_user.o xattr_trusted.o

endif



ifeq ($(CONFIG_REISERFS_FS_SECURITY),y)

fs/reiserfs/bitmap.c

+34 −38
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


#define SET_OPTION(optname) \

   do { \

        reiserfs_warning(s, "reiserfs: option \"%s\" is set", #optname); \

	reiserfs_info(s, "block allocator option \"%s\" is set", #optname); \

	set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \

    } while(0)

#define TEST_OPTION(optname, s) \
@@ -64,8 +64,8 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value) 
	unsigned int bmap_count = reiserfs_bmap_count(s);



	if (block == 0 || block >= SB_BLOCK_COUNT(s)) {

		reiserfs_warning(s,

				 "vs-4010: is_reusable: block number is out of range %lu (%u)",

		reiserfs_error(s, "vs-4010",

			       "block number is out of range %lu (%u)",

			       block, SB_BLOCK_COUNT(s));

		return 0;

	}
@@ -79,30 +79,29 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value) 
		b_blocknr_t bmap1 = REISERFS_SB(s)->s_sbh->b_blocknr + 1;

		if (block >= bmap1 &&

		    block <= bmap1 + bmap_count) {

			reiserfs_warning(s, "vs: 4019: is_reusable: "

					 "bitmap block %lu(%u) can't be freed or reused",

			reiserfs_error(s, "vs-4019", "bitmap block %lu(%u) "

				       "can't be freed or reused",

				       block, bmap_count);

			return 0;

		}

	} else {

		if (offset == 0) {

			reiserfs_warning(s, "vs: 4020: is_reusable: "

					 "bitmap block %lu(%u) can't be freed or reused",

			reiserfs_error(s, "vs-4020", "bitmap block %lu(%u) "

				       "can't be freed or reused",

				       block, bmap_count);

			return 0;

		}

	}



	if (bmap >= bmap_count) {

		reiserfs_warning(s,

				 "vs-4030: is_reusable: there is no so many bitmap blocks: "

				 "block=%lu, bitmap_nr=%u", block, bmap);

		reiserfs_error(s, "vs-4030", "bitmap for requested block "

			       "is out of range: block=%lu, bitmap_nr=%u",

			       block, bmap);

		return 0;

	}



	if (bit_value == 0 && block == SB_ROOT_BLOCK(s)) {

		reiserfs_warning(s,

				 "vs-4050: is_reusable: this is root block (%u), "

		reiserfs_error(s, "vs-4050", "this is root block (%u), "

			       "it must be busy", SB_ROOT_BLOCK(s));

		return 0;

	}
@@ -154,8 +153,8 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th, 
/* - I mean `a window of zero bits' as in description of this function - Zam. */



	if (!bi) {

		reiserfs_warning(s, "NULL bitmap info pointer for bitmap %d",

				 bmap_n);

		reiserfs_error(s, "jdm-4055", "NULL bitmap info pointer "

			       "for bitmap %d", bmap_n);

		return 0;

	}
@@ -400,11 +399,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th, 
	get_bit_address(s, block, &nr, &offset);



	if (nr >= reiserfs_bmap_count(s)) {

		reiserfs_warning(s, "vs-4075: reiserfs_free_block: "

				 "block %lu is out of range on %s "

				 "(nr=%u,max=%u)", block,

				 reiserfs_bdevname(s), nr,

				 reiserfs_bmap_count(s));

		reiserfs_error(s, "vs-4075", "block %lu is out of range",

			       block);

		return;

	}
@@ -416,9 +412,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th, 


	/* clear bit for the given block in bit map */

	if (!reiserfs_test_and_clear_le_bit(offset, bmbh->b_data)) {

		reiserfs_warning(s, "vs-4080: reiserfs_free_block: "

				 "free_block (%s:%lu)[dev:blocknr]: bit already cleared",

				 reiserfs_bdevname(s), block);

		reiserfs_error(s, "vs-4080",

			       "block %lu: bit already cleared", block);

	}

	apbi[nr].free_count++;

	journal_mark_dirty(th, s, bmbh);
@@ -445,7 +440,7 @@ void reiserfs_free_block(struct reiserfs_transaction_handle *th, 
		return;



	if (block > sb_block_count(REISERFS_SB(s)->s_rs)) {

		reiserfs_panic(th->t_super, "bitmap-4072",

		reiserfs_error(th->t_super, "bitmap-4072",

			       "Trying to free block outside file system "

			       "boundaries (%lu > %lu)",

			       block, sb_block_count(REISERFS_SB(s)->s_rs));
@@ -477,9 +472,8 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th, 
	BUG_ON(!th->t_trans_id);

#ifdef CONFIG_REISERFS_CHECK

	if (ei->i_prealloc_count < 0)

		reiserfs_warning(th->t_super,

				 "zam-4001:%s: inode has negative prealloc blocks count.",

				 __func__);

		reiserfs_error(th->t_super, "zam-4001",

			       "inode has negative prealloc blocks count.");

#endif

	while (ei->i_prealloc_count > 0) {

		reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block);
@@ -515,9 +509,9 @@ void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th) 
				i_prealloc_list);

#ifdef CONFIG_REISERFS_CHECK

		if (!ei->i_prealloc_count) {

			reiserfs_warning(th->t_super,

					 "zam-4001:%s: inode is in prealloc list but has no preallocated blocks.",

					 __func__);

			reiserfs_error(th->t_super, "zam-4001",

				       "inode is in prealloc list but has "

				       "no preallocated blocks.");

		}

#endif

		__discard_prealloc(th, ei);
@@ -631,12 +625,12 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options) 
			continue;

		}



		reiserfs_warning(s, "zam-4001: %s : unknown option - %s",

				 __func__, this_char);

		reiserfs_warning(s, "zam-4001", "unknown option - %s",

				 this_char);

		return 1;

	}



	reiserfs_warning(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s));

	reiserfs_info(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s));

	return 0;

}
@@ -1221,7 +1215,9 @@ void reiserfs_cache_bitmap_metadata(struct super_block *sb, 
	unsigned long *cur = (unsigned long *)(bh->b_data + bh->b_size);



	/* The first bit must ALWAYS be 1 */

	BUG_ON(!reiserfs_test_le_bit(0, (unsigned long *)bh->b_data));

	if (!reiserfs_test_le_bit(0, (unsigned long *)bh->b_data))

		reiserfs_error(sb, "reiserfs-2025", "bitmap block %lu is "

			       "corrupted: first bit must be 1", bh->b_blocknr);



	info->free_count = 0;

fs/reiserfs/dir.c

+15 −13
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ static int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, 


#define store_ih(where,what) copy_item_head (where, what)



//

static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir)

int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent,

			   filldir_t filldir, loff_t *pos)

{

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct inode *inode = dentry->d_inode;

	struct cpu_key pos_key;	/* key of current position in the directory (key of directory entry) */

	INITIALIZE_PATH(path_to_entry);

	struct buffer_head *bh;
@@ -64,13 +64,9 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 


	/* form key for search the next directory entry using f_pos field of

	   file structure */

	make_cpu_key(&pos_key, inode,

		     (filp->f_pos) ? (filp->f_pos) : DOT_OFFSET, TYPE_DIRENTRY,

		     3);

	make_cpu_key(&pos_key, inode, *pos ?: DOT_OFFSET, TYPE_DIRENTRY, 3);

	next_pos = cpu_key_k_offset(&pos_key);



	/*  reiserfs_warning (inode->i_sb, "reiserfs_readdir 1: f_pos = %Ld", filp->f_pos); */



	path_to_entry.reada = PATH_READA;

	while (1) {

	      research:
@@ -144,7 +140,7 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
				/* Ignore the .reiserfs_priv entry */

				if (reiserfs_xattrs(inode->i_sb) &&

				    !old_format_only(inode->i_sb) &&

				    filp->f_path.dentry == inode->i_sb->s_root &&

				    dentry == inode->i_sb->s_root &&

				    REISERFS_SB(inode->i_sb)->priv_root &&

				    REISERFS_SB(inode->i_sb)->priv_root->d_inode

				    && deh_objectid(deh) ==
@@ -156,7 +152,7 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
				}



				d_off = deh_offset(deh);

				filp->f_pos = d_off;

				*pos = d_off;

				d_ino = deh_objectid(deh);

				if (d_reclen <= 32) {

					local_buf = small_buf;
@@ -224,7 +220,7 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	}			/* while */



end:

	filp->f_pos = next_pos;

	*pos = next_pos;

	pathrelse(&path_to_entry);

	reiserfs_check_path(&path_to_entry);

out:
@@ -232,6 +228,12 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	return ret;

}



static int reiserfs_readdir(struct file *file, void *dirent, filldir_t filldir)

{

	struct dentry *dentry = file->f_path.dentry;

	return reiserfs_readdir_dentry(dentry, dirent, filldir, &file->f_pos);

}



/* compose directory item containing "." and ".." entries (entries are

   not aligned to 4 byte boundary) */

/* the last four params are LE */

fs/reiserfs/do_balan.c

+129 −184

File changed.

Preview size limit exceeded, changes collapsed.

fs/reiserfs/file.c

+17 −17
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp) 
			 * and let the admin know what is going on.

			 */

			igrab(inode);

			reiserfs_warning(inode->i_sb,

			reiserfs_warning(inode->i_sb, "clm-9001",

					 "pinning inode %lu because the "

					 "preallocation can't be freed",

					 inode->i_ino);
@@ -134,23 +134,23 @@ static void reiserfs_vfs_truncate_file(struct inode *inode) 
 * be removed...

 */



static int reiserfs_sync_file(struct file *p_s_filp,

			      struct dentry *p_s_dentry, int datasync)

static int reiserfs_sync_file(struct file *filp,

			      struct dentry *dentry, int datasync)

{

	struct inode *p_s_inode = p_s_dentry->d_inode;

	int n_err;

	struct inode *inode = dentry->d_inode;

	int err;

	int barrier_done;



	BUG_ON(!S_ISREG(p_s_inode->i_mode));

	n_err = sync_mapping_buffers(p_s_inode->i_mapping);

	reiserfs_write_lock(p_s_inode->i_sb);

	barrier_done = reiserfs_commit_for_inode(p_s_inode);

	reiserfs_write_unlock(p_s_inode->i_sb);

	if (barrier_done != 1 && reiserfs_barrier_flush(p_s_inode->i_sb))

		blkdev_issue_flush(p_s_inode->i_sb->s_bdev, NULL);

	BUG_ON(!S_ISREG(inode->i_mode));

	err = sync_mapping_buffers(inode->i_mapping);

	reiserfs_write_lock(inode->i_sb);

	barrier_done = reiserfs_commit_for_inode(inode);

	reiserfs_write_unlock(inode->i_sb);

	if (barrier_done != 1 && reiserfs_barrier_flush(inode->i_sb))

		blkdev_issue_flush(inode->i_sb->s_bdev, NULL);

	if (barrier_done < 0)

		return barrier_done;

	return (n_err < 0) ? -EIO : 0;

	return (err < 0) ? -EIO : 0;

}



/* taken fs/buffer.c:__block_commit_write */

CRA Git | Maintained and supported by SUSTech CRA and CCSE