Commit 7c955fca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  UDF: Close small mem leak in udf_find_entry()
  udf: Fix directory corruption after extent merging
  udf: Protect udf_file_aio_write from possible races
  udf: Remove unnecessary bkl usages
  udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution
  udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct
  udf: Remove BKL from free space counting functions
  udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks()
  udf: Remove BKL from udf_put_super() and udf_remount_fs()
  udf: Protect default inode credentials by rwlock
  udf: Protect all modifications of LVID with s_alloc_mutex
  udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex
  udf: Remove BKL from udf_update_inode
  udf: Convert UDF_SB(sb)->s_flags to use bitops
  fs/udf: Add printf format/argument verification
  fs/udf: Use vzalloc

(Evil merge: this also removes the BKL dependency from the Kconfig file)
parents e9688f6a a4264b3f

fs/udf/Kconfig

+0 −1
Original line number Diff line number Diff line 
config UDF_FS

	tristate "UDF file system support"

	depends on BKL # needs serious work to remove

	select CRC_ITU_T

	help

	  This is the new file system used on some CD-ROMs and DVDs. Say Y if

fs/udf/balloc.c

+1 −2
Original line number Diff line number Diff line
@@ -157,10 +157,9 @@ static void udf_bitmap_free_blocks(struct super_block *sb, 
				udf_debug("bit %ld already set\n", bit + i);

				udf_debug("byte=%2x\n",

					((char *)bh->b_data)[(bit + i) >> 3]);

			} else {

				udf_add_free_space(sb, sbi->s_partition, 1);

			}

		}

		udf_add_free_space(sb, sbi->s_partition, count);

		mark_buffer_dirty(bh);

		if (overflow) {

			block += count;

fs/udf/dir.c

+0 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/errno.h>

#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/buffer_head.h>



#include "udf_i.h"
@@ -190,18 +189,14 @@ static int udf_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	struct inode *dir = filp->f_path.dentry->d_inode;

	int result;



	lock_kernel();



	if (filp->f_pos == 0) {

		if (filldir(dirent, ".", 1, filp->f_pos, dir->i_ino, DT_DIR) < 0) {

			unlock_kernel();

			return 0;

		}

		filp->f_pos++;

	}



	result = do_udf_readdir(dir, filp, filldir, dirent);

	unlock_kernel();

 	return result;

}

fs/udf/file.c

+5 −6
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/string.h> /* memset */

#include <linux/capability.h>

#include <linux/errno.h>

#include <linux/smp_lock.h>

#include <linux/pagemap.h>

#include <linux/buffer_head.h>

#include <linux/aio.h>
@@ -114,6 +113,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
	size_t count = iocb->ki_left;

	struct udf_inode_info *iinfo = UDF_I(inode);



	down_write(&iinfo->i_data_sem);

	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {

		if (file->f_flags & O_APPEND)

			pos = inode->i_size;
@@ -126,6 +126,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
			udf_expand_file_adinicb(inode, pos + count, &err);

			if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {

				udf_debug("udf_expand_adinicb: err=%d\n", err);

				up_write(&iinfo->i_data_sem);

				return err;

			}

		} else {
@@ -135,6 +136,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
				iinfo->i_lenAlloc = inode->i_size;

		}

	}

	up_write(&iinfo->i_data_sem);



	retval = generic_file_aio_write(iocb, iov, nr_segs, ppos);

	if (retval > 0)
@@ -149,8 +151,6 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	long old_block, new_block;

	int result = -EINVAL;



	lock_kernel();



	if (file_permission(filp, MAY_READ) != 0) {

		udf_debug("no permission to access inode %lu\n", inode->i_ino);

		result = -EPERM;
@@ -196,7 +196,6 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	}



out:

	unlock_kernel();

	return result;

}
@@ -204,10 +203,10 @@ static int udf_release_file(struct inode *inode, struct file *filp) 
{

	if (filp->f_mode & FMODE_WRITE) {

		mutex_lock(&inode->i_mutex);

		lock_kernel();

		down_write(&UDF_I(inode)->i_data_sem);

		udf_discard_prealloc(inode);

		udf_truncate_tail_extent(inode);

		unlock_kernel();

		up_write(&UDF_I(inode)->i_data_sem);

		mutex_unlock(&inode->i_mutex);

	}

	return 0;

fs/udf/ialloc.c

+6 −15
Original line number Diff line number Diff line
@@ -92,28 +92,19 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) 
		return NULL;

	}



	mutex_lock(&sbi->s_alloc_mutex);

	if (sbi->s_lvid_bh) {

		struct logicalVolIntegrityDesc *lvid =

			(struct logicalVolIntegrityDesc *)

			sbi->s_lvid_bh->b_data;

		struct logicalVolIntegrityDescImpUse *lvidiu =

							udf_sb_lvidiu(sbi);

		struct logicalVolHeaderDesc *lvhd;

		uint64_t uniqueID;

		lvhd = (struct logicalVolHeaderDesc *)

				(lvid->logicalVolContentsUse);

		struct logicalVolIntegrityDescImpUse *lvidiu;



		iinfo->i_unique = lvid_get_unique_id(sb);

		mutex_lock(&sbi->s_alloc_mutex);

		lvidiu = udf_sb_lvidiu(sbi);

		if (S_ISDIR(mode))

			le32_add_cpu(&lvidiu->numDirs, 1);

		else

			le32_add_cpu(&lvidiu->numFiles, 1);

		iinfo->i_unique = uniqueID = le64_to_cpu(lvhd->uniqueID);

		if (!(++uniqueID & 0x00000000FFFFFFFFUL))

			uniqueID += 16;

		lvhd->uniqueID = cpu_to_le64(uniqueID);

		udf_updated_lvid(sb);

	}

		mutex_unlock(&sbi->s_alloc_mutex);

	}



	inode_init_owner(inode, dir, mode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE