Commit 70fcf5c3 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-fs 

Pull UDF fixes and cleanups from Jan Kara:
 "Several small UDF fixes and cleanups and a small cleanup of fanotify
  code"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fanotify: simplify the code of fanotify_merge
  udf: simplify udf_ioctl()
  udf: fix ioctl errors
  udf: allow implicit blocksize specification during mount
  udf: check partition reference in udf_read_inode()
  udf: atomically read inode size
  udf: merge module informations in super.c
  udf: remove next_epos from udf_update_extent_cache()
  udf: Factor out trimming of crtime
  udf: remove empty condition
  udf: remove unneeded line break
  udf: merge bh free
  udf: use pointer for kernel_long_ad argument
  udf: use __packed instead of __attribute__ ((packed))
  udf: Make stat on symlink report symlink length as st_size
  fs/udf: make #ifdef UDF_PREALLOCATE unconditional
  fs: udf: Replace CURRENT_TIME with current_time()
parents 2bfe01ef 6c71100d

fs/notify/fanotify/fanotify.c

+3 −8
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ static bool should_merge(struct fsnotify_event *old_fsn, 
static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)

{

	struct fsnotify_event *test_event;

	bool do_merge = false;



	pr_debug("%s: list=%p event=%p\n", __func__, list, event);
@@ -47,16 +46,12 @@ static int fanotify_merge(struct list_head *list, struct fsnotify_event *event) 


	list_for_each_entry_reverse(test_event, list, list) {

		if (should_merge(test_event, event)) {

			do_merge = true;

			break;

			test_event->mask |= event->mask;

			return 1;

		}

	}



	if (!do_merge)

	return 0;



	test_event->mask |= event->mask;

	return 1;

}



#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS

fs/udf/ecma_167.h

+49 −49
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
struct charspec {

	uint8_t		charSetType;

	uint8_t		charSetInfo[63];

} __attribute__ ((packed));

} __packed;



/* Character Set Type (ECMA 167r3 1/7.2.1.1) */

#define CHARSPEC_TYPE_CS0		0x00	/* (1/7.2.2) */
@@ -68,7 +68,7 @@ struct timestamp { 
	uint8_t		centiseconds;

	uint8_t		hundredsOfMicroseconds;

	uint8_t		microseconds;

} __attribute__ ((packed));

} __packed;



/* Type and Time Zone (ECMA 167r3 1/7.3.1) */

#define TIMESTAMP_TYPE_MASK		0xF000
@@ -82,7 +82,7 @@ struct regid { 
	uint8_t		flags;

	uint8_t		ident[23];

	uint8_t		identSuffix[8];

} __attribute__ ((packed));

} __packed;



/* Flags (ECMA 167r3 1/7.4.1) */

#define ENTITYID_FLAGS_DIRTY		0x00
@@ -95,7 +95,7 @@ struct volStructDesc { 
	uint8_t		stdIdent[VSD_STD_ID_LEN];

	uint8_t		structVersion;

	uint8_t		structData[2041];

} __attribute__ ((packed));

} __packed;



/* Standard Identifier (EMCA 167r2 2/9.1.2) */

#define VSD_STD_ID_NSR02		"NSR02"	/* (3/9.1) */
@@ -114,7 +114,7 @@ struct beginningExtendedAreaDesc { 
	uint8_t		stdIdent[VSD_STD_ID_LEN];

	uint8_t		structVersion;

	uint8_t		structData[2041];

} __attribute__ ((packed));

} __packed;



/* Terminating Extended Area Descriptor (ECMA 167r3 2/9.3) */

struct terminatingExtendedAreaDesc {
@@ -122,7 +122,7 @@ struct terminatingExtendedAreaDesc { 
	uint8_t		stdIdent[VSD_STD_ID_LEN];

	uint8_t		structVersion;

	uint8_t		structData[2041];

} __attribute__ ((packed));

} __packed;



/* Boot Descriptor (ECMA 167r3 2/9.4) */

struct bootDesc {
@@ -140,7 +140,7 @@ struct bootDesc { 
	__le16			flags;

	uint8_t			reserved2[32];

	uint8_t			bootUse[1906];

} __attribute__ ((packed));

} __packed;



/* Flags (ECMA 167r3 2/9.4.12) */

#define BOOT_FLAGS_ERASE		0x01
@@ -149,7 +149,7 @@ struct bootDesc { 
struct extent_ad {

	__le32		extLength;

	__le32		extLocation;

} __attribute__ ((packed));

} __packed;



struct kernel_extent_ad {

	uint32_t	extLength;
@@ -166,7 +166,7 @@ struct tag { 
	__le16		descCRC;

	__le16		descCRCLength;

	__le32		tagLocation;

} __attribute__ ((packed));

} __packed;



/* Tag Identifier (ECMA 167r3 3/7.2.1) */

#define TAG_IDENT_PVD			0x0001
@@ -186,7 +186,7 @@ struct NSRDesc { 
	uint8_t		structVersion;

	uint8_t		reserved;

	uint8_t		structData[2040];

} __attribute__ ((packed));

} __packed;



/* Primary Volume Descriptor (ECMA 167r3 3/10.1) */

struct primaryVolDesc {
@@ -212,7 +212,7 @@ struct primaryVolDesc { 
	__le32			predecessorVolDescSeqLocation;

	__le16			flags;

	uint8_t			reserved[22];

} __attribute__ ((packed));

} __packed;



/* Flags (ECMA 167r3 3/10.1.21) */

#define PVD_FLAGS_VSID_COMMON		0x0001
@@ -223,7 +223,7 @@ struct anchorVolDescPtr { 
	struct extent_ad	mainVolDescSeqExt;

	struct extent_ad	reserveVolDescSeqExt;

	uint8_t	 		reserved[480];

} __attribute__ ((packed));

} __packed;



/* Volume Descriptor Pointer (ECMA 167r3 3/10.3) */

struct volDescPtr {
@@ -231,7 +231,7 @@ struct volDescPtr { 
	__le32			volDescSeqNum;

	struct extent_ad	nextVolDescSeqExt;

	uint8_t			reserved[484];

} __attribute__ ((packed));

} __packed;



/* Implementation Use Volume Descriptor (ECMA 167r3 3/10.4) */

struct impUseVolDesc {
@@ -239,7 +239,7 @@ struct impUseVolDesc { 
	__le32		volDescSeqNum;

	struct regid	impIdent;

	uint8_t		impUse[460];

} __attribute__ ((packed));

} __packed;



/* Partition Descriptor (ECMA 167r3 3/10.5) */

struct partitionDesc {
@@ -255,7 +255,7 @@ struct partitionDesc { 
	struct regid impIdent;

	uint8_t impUse[128];

	uint8_t reserved[156];

} __attribute__ ((packed));

} __packed;



/* Partition Flags (ECMA 167r3 3/10.5.3) */

#define PD_PARTITION_FLAGS_ALLOC	0x0001
@@ -291,14 +291,14 @@ struct logicalVolDesc { 
	uint8_t			impUse[128];

	struct extent_ad	integritySeqExt;

	uint8_t			partitionMaps[0];

} __attribute__ ((packed));

} __packed;



/* Generic Partition Map (ECMA 167r3 3/10.7.1) */

struct genericPartitionMap {

	uint8_t		partitionMapType;

	uint8_t		partitionMapLength;

	uint8_t		partitionMapping[0];

} __attribute__ ((packed));

} __packed;



/* Partition Map Type (ECMA 167r3 3/10.7.1.1) */

#define GP_PARTITION_MAP_TYPE_UNDEF	0x00
@@ -311,14 +311,14 @@ struct genericPartitionMap1 { 
	uint8_t		partitionMapLength;

	__le16		volSeqNum;

	__le16		partitionNum;

} __attribute__ ((packed));

} __packed;



/* Type 2 Partition Map (ECMA 167r3 3/10.7.3) */

struct genericPartitionMap2 {

	uint8_t		partitionMapType;

	uint8_t		partitionMapLength;

	uint8_t		partitionIdent[62];

} __attribute__ ((packed));

} __packed;



/* Unallocated Space Descriptor (ECMA 167r3 3/10.8) */

struct unallocSpaceDesc {
@@ -326,13 +326,13 @@ struct unallocSpaceDesc { 
	__le32			volDescSeqNum;

	__le32			numAllocDescs;

	struct extent_ad	allocDescs[0];

} __attribute__ ((packed));

} __packed;



/* Terminating Descriptor (ECMA 167r3 3/10.9) */

struct terminatingDesc {

	struct tag	descTag;

	uint8_t		reserved[496];

} __attribute__ ((packed));

} __packed;



/* Logical Volume Integrity Descriptor (ECMA 167r3 3/10.10) */

struct logicalVolIntegrityDesc {
@@ -346,7 +346,7 @@ struct logicalVolIntegrityDesc { 
	__le32			freeSpaceTable[0];

	__le32			sizeTable[0];

	uint8_t			impUse[0];

} __attribute__ ((packed));

} __packed;



/* Integrity Type (ECMA 167r3 3/10.10.3) */

#define LVID_INTEGRITY_TYPE_OPEN	0x00000000
@@ -356,7 +356,7 @@ struct logicalVolIntegrityDesc { 
struct lb_addr {

	__le32		logicalBlockNum;

	__le16	 	partitionReferenceNum;

} __attribute__ ((packed));

} __packed;



/* ... and its in-core analog */

struct kernel_lb_addr {
@@ -368,14 +368,14 @@ struct kernel_lb_addr { 
struct short_ad {

        __le32		extLength;

        __le32		extPosition;

} __attribute__ ((packed));

} __packed;



/* Long Allocation Descriptor (ECMA 167r3 4/14.14.2) */

struct long_ad {

	__le32		extLength;

	struct lb_addr	extLocation;

	uint8_t		impUse[6];

} __attribute__ ((packed));

} __packed;



struct kernel_long_ad {

	uint32_t		extLength;
@@ -389,7 +389,7 @@ struct ext_ad { 
	__le32		recordedLength;

	__le32		informationLength;

	struct lb_addr	extLocation;

} __attribute__ ((packed));

} __packed;



struct kernel_ext_ad {

	uint32_t		extLength;
@@ -434,7 +434,7 @@ struct fileSetDesc { 
	struct long_ad		nextExt;

	struct long_ad		streamDirectoryICB;

	uint8_t			reserved[32];

} __attribute__ ((packed));

} __packed;



/* Partition Header Descriptor (ECMA 167r3 4/14.3) */

struct partitionHeaderDesc {
@@ -444,7 +444,7 @@ struct partitionHeaderDesc { 
	struct short_ad	freedSpaceTable;

	struct short_ad	freedSpaceBitmap;

	uint8_t		reserved[88];

} __attribute__ ((packed));

} __packed;



/* File Identifier Descriptor (ECMA 167r3 4/14.4) */

struct fileIdentDesc {
@@ -457,7 +457,7 @@ struct fileIdentDesc { 
	uint8_t		impUse[0];

	uint8_t		fileIdent[0];

	uint8_t		padding[0];

} __attribute__ ((packed));

} __packed;



/* File Characteristics (ECMA 167r3 4/14.4.3) */

#define FID_FILE_CHAR_HIDDEN		0x01
@@ -471,7 +471,7 @@ struct allocExtDesc { 
	struct tag	descTag;

	__le32		previousAllocExtLocation;

	__le32		lengthAllocDescs;

} __attribute__ ((packed));

} __packed;



/* ICB Tag (ECMA 167r3 4/14.6) */

struct icbtag {
@@ -483,7 +483,7 @@ struct icbtag { 
	uint8_t		fileType;

	struct lb_addr	parentICBLocation;

	__le16		flags;

} __attribute__ ((packed));

} __packed;



/* Strategy Type (ECMA 167r3 4/14.6.2) */

#define ICBTAG_STRATEGY_TYPE_UNDEF	0x0000
@@ -531,13 +531,13 @@ struct indirectEntry { 
	struct tag	descTag;

	struct icbtag	icbTag;

	struct long_ad	indirectICB;

} __attribute__ ((packed));

} __packed;



/* Terminal Entry (ECMA 167r3 4/14.8) */

struct terminalEntry {

	struct tag	descTag;

	struct icbtag	icbTag;

} __attribute__ ((packed));

} __packed;



/* File Entry (ECMA 167r3 4/14.9) */

struct fileEntry {
@@ -563,7 +563,7 @@ struct fileEntry { 
	__le32			lengthAllocDescs;

	uint8_t			extendedAttr[0];

	uint8_t			allocDescs[0];

} __attribute__ ((packed));

} __packed;



/* Permissions (ECMA 167r3 4/14.9.5) */

#define FE_PERM_O_EXEC			0x00000001U
@@ -607,7 +607,7 @@ struct extendedAttrHeaderDesc { 
	struct tag	descTag;

	__le32		impAttrLocation;

	__le32		appAttrLocation;

} __attribute__ ((packed));

} __packed;



/* Generic Format (ECMA 167r3 4/14.10.2) */

struct genericFormat {
@@ -616,7 +616,7 @@ struct genericFormat { 
	uint8_t		reserved[3];

	__le32		attrLength;

	uint8_t		attrData[0];

} __attribute__ ((packed));

} __packed;



/* Character Set Information (ECMA 167r3 4/14.10.3) */

struct charSetInfo {
@@ -627,7 +627,7 @@ struct charSetInfo { 
	__le32		escapeSeqLength;

	uint8_t		charSetType;

	uint8_t		escapeSeq[0];

} __attribute__ ((packed));

} __packed;



/* Alternate Permissions (ECMA 167r3 4/14.10.4) */

struct altPerms {
@@ -638,7 +638,7 @@ struct altPerms { 
	__le16		ownerIdent;

	__le16		groupIdent;

	__le16		permission;

} __attribute__ ((packed));

} __packed;



/* File Times Extended Attribute (ECMA 167r3 4/14.10.5) */

struct fileTimesExtAttr {
@@ -649,7 +649,7 @@ struct fileTimesExtAttr { 
	__le32		dataLength;

	__le32		fileTimeExistence;

	uint8_t		fileTimes;

} __attribute__ ((packed));

} __packed;



/* FileTimeExistence (ECMA 167r3 4/14.10.5.6) */

#define FTE_CREATION			0x00000001
@@ -666,7 +666,7 @@ struct infoTimesExtAttr { 
	__le32		dataLength;

	__le32		infoTimeExistence;

	uint8_t		infoTimes[0];

} __attribute__ ((packed));

} __packed;



/* Device Specification (ECMA 167r3 4/14.10.7) */

struct deviceSpec {
@@ -678,7 +678,7 @@ struct deviceSpec { 
	__le32		majorDeviceIdent;

	__le32		minorDeviceIdent;

	uint8_t		impUse[0];

} __attribute__ ((packed));

} __packed;



/* Implementation Use Extended Attr (ECMA 167r3 4/14.10.8) */

struct impUseExtAttr {
@@ -689,7 +689,7 @@ struct impUseExtAttr { 
	__le32		impUseLength;

	struct regid	impIdent;

	uint8_t		impUse[0];

} __attribute__ ((packed));

} __packed;



/* Application Use Extended Attribute (ECMA 167r3 4/14.10.9) */

struct appUseExtAttr {
@@ -700,7 +700,7 @@ struct appUseExtAttr { 
	__le32		appUseLength;

	struct regid	appIdent;

	uint8_t		appUse[0];

} __attribute__ ((packed));

} __packed;



#define EXTATTR_CHAR_SET		1

#define EXTATTR_ALT_PERMS		3
@@ -716,7 +716,7 @@ struct unallocSpaceEntry { 
	struct icbtag	icbTag;

	__le32		lengthAllocDescs;

	uint8_t		allocDescs[0];

} __attribute__ ((packed));

} __packed;



/* Space Bitmap Descriptor (ECMA 167r3 4/14.12) */

struct spaceBitmapDesc {
@@ -724,7 +724,7 @@ struct spaceBitmapDesc { 
	__le32		numOfBits;

	__le32		numOfBytes;

	uint8_t		bitmap[0];

} __attribute__ ((packed));

} __packed;



/* Partition Integrity Entry (ECMA 167r3 4/14.13) */

struct partitionIntegrityEntry {
@@ -735,7 +735,7 @@ struct partitionIntegrityEntry { 
	uint8_t			reserved[175];

	struct regid		impIdent;

	uint8_t			impUse[256];

} __attribute__ ((packed));

} __packed;



/* Short Allocation Descriptor (ECMA 167r3 4/14.14.1) */
@@ -753,7 +753,7 @@ struct partitionIntegrityEntry { 
struct logicalVolHeaderDesc {

	__le64		uniqueID;

	uint8_t		reserved[24];

} __attribute__ ((packed));

} __packed;



/* Path Component (ECMA 167r3 4/14.16.1) */

struct pathComponent {
@@ -761,7 +761,7 @@ struct pathComponent { 
	uint8_t		lengthComponentIdent;

	__le16		componentFileVersionNum;

	dstring		componentIdent[0];

} __attribute__ ((packed));

} __packed;



/* File Entry (ECMA 167r3 4/14.17) */

struct extendedFileEntry {
@@ -791,6 +791,6 @@ struct extendedFileEntry { 
	__le32			lengthAllocDescs;

	uint8_t			extendedAttr[0];

	uint8_t			allocDescs[0];

} __attribute__ ((packed));

} __packed;



#endif /* _ECMA_167_H */

fs/udf/file.c

+19 −27
Original line number Diff line number Diff line
@@ -176,54 +176,46 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
{

	struct inode *inode = file_inode(filp);

	long old_block, new_block;

	int result = -EINVAL;

	int result;



	if (inode_permission(inode, MAY_READ) != 0) {

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

		result = -EPERM;

		goto out;

		return -EPERM;

	}



	if (!arg) {

	if (!arg && ((cmd == UDF_GETVOLIDENT) || (cmd == UDF_GETEASIZE) ||

		     (cmd == UDF_RELOCATE_BLOCKS) || (cmd == UDF_GETEABLOCK))) {

		udf_debug("invalid argument to udf_ioctl\n");

		result = -EINVAL;

		goto out;

		return -EINVAL;

	}



	switch (cmd) {

	case UDF_GETVOLIDENT:

		if (copy_to_user((char __user *)arg,

				 UDF_SB(inode->i_sb)->s_volume_ident, 32))

			result = -EFAULT;

		else

			result = 0;

		goto out;

			return -EFAULT;

		return 0;

	case UDF_RELOCATE_BLOCKS:

		if (!capable(CAP_SYS_ADMIN)) {

			result = -EPERM;

			goto out;

		}

		if (get_user(old_block, (long __user *)arg)) {

			result = -EFAULT;

			goto out;

		}

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (get_user(old_block, (long __user *)arg))

			return -EFAULT;

		result = udf_relocate_blocks(inode->i_sb,

						old_block, &new_block);

		if (result == 0)

			result = put_user(new_block, (long __user *)arg);

		goto out;

		return result;

	case UDF_GETEASIZE:

		result = put_user(UDF_I(inode)->i_lenEAttr, (int __user *)arg);

		goto out;

		return put_user(UDF_I(inode)->i_lenEAttr, (int __user *)arg);

	case UDF_GETEABLOCK:

		result = copy_to_user((char __user *)arg,

		return copy_to_user((char __user *)arg,

				    UDF_I(inode)->i_ext.i_data,

				    UDF_I(inode)->i_lenEAttr) ? -EFAULT : 0;

		goto out;

	default:

		return -ENOIOCTLCMD;

	}



out:

	return result;

	return 0;

}



static int udf_release_file(struct inode *inode, struct file *filp)

fs/udf/inode.c

+49 −69
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ 
#include "udf_i.h"

#include "udf_sb.h"



MODULE_AUTHOR("Ben Fennema");

MODULE_DESCRIPTION("Universal Disk Format Filesystem");

MODULE_LICENSE("GPL");



#define EXTENT_MERGE_SIZE 5



static umode_t udf_convert_permissions(struct fileEntry *);
@@ -57,14 +53,12 @@ static sector_t inode_getblk(struct inode *, sector_t, int *, int *); 
static int8_t udf_insert_aext(struct inode *, struct extent_position,

			      struct kernel_lb_addr, uint32_t);

static void udf_split_extents(struct inode *, int *, int, int,

			      struct kernel_long_ad[EXTENT_MERGE_SIZE], int *);

			      struct kernel_long_ad *, int *);

static void udf_prealloc_extents(struct inode *, int, int,

				 struct kernel_long_ad[EXTENT_MERGE_SIZE], int *);

static void udf_merge_extents(struct inode *,

			      struct kernel_long_ad[EXTENT_MERGE_SIZE], int *);

static void udf_update_extents(struct inode *,

			       struct kernel_long_ad[EXTENT_MERGE_SIZE], int, int,

			       struct extent_position *);

				 struct kernel_long_ad *, int *);

static void udf_merge_extents(struct inode *, struct kernel_long_ad *, int *);

static void udf_update_extents(struct inode *, struct kernel_long_ad *, int,

			       int, struct extent_position *);

static int udf_get_block(struct inode *, sector_t, struct buffer_head *, int);



static void __udf_clear_extent_cache(struct inode *inode)
@@ -111,7 +105,7 @@ static int udf_read_extent_cache(struct inode *inode, loff_t bcount, 


/* Add extent to extent cache */

static void udf_update_extent_cache(struct inode *inode, loff_t estart,

				    struct extent_position *pos, int next_epos)

				    struct extent_position *pos)

{

	struct udf_inode_info *iinfo = UDF_I(inode);
@@ -120,18 +114,15 @@ static void udf_update_extent_cache(struct inode *inode, loff_t estart, 
	__udf_clear_extent_cache(inode);

	if (pos->bh)

		get_bh(pos->bh);

	memcpy(&iinfo->cached_extent.epos, pos,

	       sizeof(struct extent_position));

	memcpy(&iinfo->cached_extent.epos, pos, sizeof(struct extent_position));

	iinfo->cached_extent.lstart = estart;

	if (next_epos)

	switch (iinfo->i_alloc_type) {

	case ICBTAG_FLAG_AD_SHORT:

			iinfo->cached_extent.epos.offset -=

			sizeof(struct short_ad);

		iinfo->cached_extent.epos.offset -= sizeof(struct short_ad);

		break;

	case ICBTAG_FLAG_AD_LONG:

			iinfo->cached_extent.epos.offset -=

			sizeof(struct long_ad);

		iinfo->cached_extent.epos.offset -= sizeof(struct long_ad);

		break;

	}

	spin_unlock(&iinfo->i_extent_cache_lock);

}
@@ -747,11 +738,8 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, 
				 ~(inode->i_sb->s_blocksize - 1));

			udf_write_aext(inode, &cur_epos, &eloc, elen, 1);

		}

		brelse(prev_epos.bh);

		brelse(cur_epos.bh);

		brelse(next_epos.bh);

		newblock = udf_get_lb_pblock(inode->i_sb, &eloc, offset);

		return newblock;

		goto out_free;

	}



	/* Are we beyond EOF? */
@@ -774,11 +762,9 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, 
		/* Create extents for the hole between EOF and offset */

		ret = udf_do_extend_file(inode, &prev_epos, laarr, offset);

		if (ret < 0) {

			brelse(prev_epos.bh);

			brelse(cur_epos.bh);

			brelse(next_epos.bh);

			*err = ret;

			return 0;

			newblock = 0;

			goto out_free;

		}

		c = 0;

		offset = 0;
@@ -841,11 +827,9 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, 
				iinfo->i_location.partitionReferenceNum,

				goal, err);

		if (!newblocknum) {

			brelse(prev_epos.bh);

			brelse(cur_epos.bh);

			brelse(next_epos.bh);

			*err = -ENOSPC;

			return 0;

			newblock = 0;

			goto out_free;

		}

		if (isBeyondEOF)

			iinfo->i_lenExtents += inode->i_sb->s_blocksize;
@@ -857,14 +841,12 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, 
	 * block */

	udf_split_extents(inode, &c, offset, newblocknum, laarr, &endnum);



#ifdef UDF_PREALLOCATE

	/* We preallocate blocks only for regular files. It also makes sense

	 * for directories but there's a problem when to drop the

	 * preallocation. We might use some delayed work for that but I feel

	 * it's overengineering for a filesystem like UDF. */

	if (S_ISREG(inode->i_mode))

		udf_prealloc_extents(inode, c, lastblock, laarr, &endnum);

#endif



	/* merge any continuous blocks in laarr */

	udf_merge_extents(inode, laarr, &endnum);
@@ -874,15 +856,11 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, 
	 * the new number of extents is less than the old number */

	udf_update_extents(inode, laarr, startnum, endnum, &prev_epos);



	brelse(prev_epos.bh);

	brelse(cur_epos.bh);

	brelse(next_epos.bh);



	newblock = udf_get_pblock(inode->i_sb, newblocknum,

				iinfo->i_location.partitionReferenceNum, 0);

	if (!newblock) {

		*err = -EIO;

		return 0;

		goto out_free;

	}

	*new = 1;

	iinfo->i_next_alloc_block = block;
@@ -893,13 +871,15 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, 
		udf_sync_inode(inode);

	else

		mark_inode_dirty(inode);



out_free:

	brelse(prev_epos.bh);

	brelse(cur_epos.bh);

	brelse(next_epos.bh);

	return newblock;

}



static void udf_split_extents(struct inode *inode, int *c, int offset,

			      int newblocknum,

			      struct kernel_long_ad laarr[EXTENT_MERGE_SIZE],

			      int newblocknum, struct kernel_long_ad *laarr,

			      int *endnum)

{

	unsigned long blocksize = inode->i_sb->s_blocksize;
@@ -963,7 +943,7 @@ static void udf_split_extents(struct inode *inode, int *c, int offset, 
}



static void udf_prealloc_extents(struct inode *inode, int c, int lastblock,

				 struct kernel_long_ad laarr[EXTENT_MERGE_SIZE],

				 struct kernel_long_ad *laarr,

				 int *endnum)

{

	int start, length = 0, currlength = 0, i;
@@ -1058,8 +1038,7 @@ static void udf_prealloc_extents(struct inode *inode, int c, int lastblock, 
	}

}



static void udf_merge_extents(struct inode *inode,

			      struct kernel_long_ad laarr[EXTENT_MERGE_SIZE],

static void udf_merge_extents(struct inode *inode, struct kernel_long_ad *laarr,

			      int *endnum)

{

	int i;
@@ -1158,8 +1137,7 @@ static void udf_merge_extents(struct inode *inode, 
	}

}



static void udf_update_extents(struct inode *inode,

			       struct kernel_long_ad laarr[EXTENT_MERGE_SIZE],

static void udf_update_extents(struct inode *inode, struct kernel_long_ad *laarr,

			       int startnum, int endnum,

			       struct extent_position *epos)

{
@@ -1299,6 +1277,12 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
	int ret = -EIO;



reread:

	if (iloc->partitionReferenceNum >= sbi->s_partitions) {

		udf_debug("partition reference: %d > logical volume partitions: %d\n",

			  iloc->partitionReferenceNum, sbi->s_partitions);

		return -EIO;

	}



	if (iloc->logicalBlockNum >=

	    sbi->s_partmaps[iloc->partitionReferenceNum].s_partition_len) {

		udf_debug("block=%d, partition=%d out of range\n",
@@ -1549,7 +1533,7 @@ reread: 
		break;

	case ICBTAG_FILE_TYPE_SYMLINK:

		inode->i_data.a_ops = &udf_symlink_aops;

		inode->i_op = &page_symlink_inode_operations;

		inode->i_op = &udf_symlink_inode_operations;

		inode_nohighmem(inode);

		inode->i_mode = S_IFLNK | S_IRWXUGO;

		break;
@@ -1627,6 +1611,14 @@ static int udf_sync_inode(struct inode *inode) 
	return udf_update_inode(inode, 1);

}



static void udf_adjust_time(struct udf_inode_info *iinfo, struct timespec time)

{

	if (iinfo->i_crtime.tv_sec > time.tv_sec ||

	    (iinfo->i_crtime.tv_sec == time.tv_sec &&

	     iinfo->i_crtime.tv_nsec > time.tv_nsec))

		iinfo->i_crtime = time;

}



static int udf_update_inode(struct inode *inode, int do_sync)

{

	struct buffer_head *bh = NULL;
@@ -1753,20 +1745,9 @@ static int udf_update_inode(struct inode *inode, int do_sync) 
		efe->objectSize = cpu_to_le64(inode->i_size);

		efe->logicalBlocksRecorded = cpu_to_le64(lb_recorded);



		if (iinfo->i_crtime.tv_sec > inode->i_atime.tv_sec ||

		    (iinfo->i_crtime.tv_sec == inode->i_atime.tv_sec &&

		     iinfo->i_crtime.tv_nsec > inode->i_atime.tv_nsec))

			iinfo->i_crtime = inode->i_atime;



		if (iinfo->i_crtime.tv_sec > inode->i_mtime.tv_sec ||

		    (iinfo->i_crtime.tv_sec == inode->i_mtime.tv_sec &&

		     iinfo->i_crtime.tv_nsec > inode->i_mtime.tv_nsec))

			iinfo->i_crtime = inode->i_mtime;



		if (iinfo->i_crtime.tv_sec > inode->i_ctime.tv_sec ||

		    (iinfo->i_crtime.tv_sec == inode->i_ctime.tv_sec &&

		     iinfo->i_crtime.tv_nsec > inode->i_ctime.tv_nsec))

			iinfo->i_crtime = inode->i_ctime;

		udf_adjust_time(iinfo, inode->i_atime);

		udf_adjust_time(iinfo, inode->i_mtime);

		udf_adjust_time(iinfo, inode->i_ctime);



		udf_time_to_disk_stamp(&efe->accessTime, inode->i_atime);

		udf_time_to_disk_stamp(&efe->modificationTime, inode->i_mtime);
@@ -2286,8 +2267,7 @@ int8_t inode_bmap(struct inode *inode, sector_t block, 
		  uint32_t *elen, sector_t *offset)

{

	unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits;

	loff_t lbcount = 0, bcount =

	    (loff_t) block << blocksize_bits;

	loff_t lbcount = 0, bcount = (loff_t) block << blocksize_bits;

	int8_t etype;

	struct udf_inode_info *iinfo;
@@ -2308,7 +2288,7 @@ int8_t inode_bmap(struct inode *inode, sector_t block, 
		lbcount += *elen;

	} while (lbcount <= bcount);

	/* update extent cache */

	udf_update_extent_cache(inode, lbcount - *elen, pos, 1);

	udf_update_extent_cache(inode, lbcount - *elen, pos);

	*offset = (bcount + *elen - lbcount) >> blocksize_bits;



	return etype;

fs/udf/lowlevel.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ unsigned long udf_get_last_block(struct super_block *sb) 
	 */

	if (ioctl_by_bdev(bdev, CDROM_LAST_WRITTEN, (unsigned long) &lblock) ||

	    lblock == 0)

		lblock = bdev->bd_inode->i_size >> sb->s_blocksize_bits;

		lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits;



	if (lblock)

		return lblock - 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE