Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Sep 2009 21:35:07 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Sep 2009 21:35:07 +0000 (14:35 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: Fix possible corruption when close races with write
  udf: Perform preallocation only for regular files
  udf: Remove wrong assignment in udf_symlink
  udf: Remove dead code

fs/udf/directory.c
fs/udf/file.c
fs/udf/inode.c
fs/udf/lowlevel.c
fs/udf/namei.c

index 1d2c570704c8f217ecf756a9b08c63457e139484..2ffdb6733af181a8f9943c03a25e41f9c5471422 100644 (file)
 #include <linux/string.h>
 #include <linux/buffer_head.h>
 
-#if 0
-static uint8_t *udf_filead_read(struct inode *dir, uint8_t *tmpad,
-                               uint8_t ad_size, struct kernel_lb_addr fe_loc,
-                               int *pos, int *offset, struct buffer_head **bh,
-                               int *error)
-{
-       int loffset = *offset;
-       int block;
-       uint8_t *ad;
-       int remainder;
-
-       *error = 0;
-
-       ad = (uint8_t *)(*bh)->b_data + *offset;
-       *offset += ad_size;
-
-       if (!ad) {
-               brelse(*bh);
-               *error = 1;
-               return NULL;
-       }
-
-       if (*offset == dir->i_sb->s_blocksize) {
-               brelse(*bh);
-               block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
-               if (!block)
-                       return NULL;
-               *bh = udf_tread(dir->i_sb, block);
-               if (!*bh)
-                       return NULL;
-       } else if (*offset > dir->i_sb->s_blocksize) {
-               ad = tmpad;
-
-               remainder = dir->i_sb->s_blocksize - loffset;
-               memcpy((uint8_t *)ad, (*bh)->b_data + loffset, remainder);
-
-               brelse(*bh);
-               block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
-               if (!block)
-                       return NULL;
-               (*bh) = udf_tread(dir->i_sb, block);
-               if (!*bh)
-                       return NULL;
-
-               memcpy((uint8_t *)ad + remainder, (*bh)->b_data,
-                       ad_size - remainder);
-               *offset = ad_size - remainder;
-       }
-
-       return ad;
-}
-#endif
-
 struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                                         struct udf_fileident_bh *fibh,
                                         struct fileIdentDesc *cfi,
@@ -248,39 +195,6 @@ struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize, int *offset)
        return fi;
 }
 
-#if 0
-static struct extent_ad *udf_get_fileextent(void *buffer, int bufsize, int *offset)
-{
-       struct extent_ad *ext;
-       struct fileEntry *fe;
-       uint8_t *ptr;
-
-       if ((!buffer) || (!offset)) {
-               printk(KERN_ERR "udf: udf_get_fileextent() invalidparms\n");
-               return NULL;
-       }
-
-       fe = (struct fileEntry *)buffer;
-
-       if (fe->descTag.tagIdent != cpu_to_le16(TAG_IDENT_FE)) {
-               udf_debug("0x%x != TAG_IDENT_FE\n",
-                         le16_to_cpu(fe->descTag.tagIdent));
-               return NULL;
-       }
-
-       ptr = (uint8_t *)(fe->extendedAttr) +
-               le32_to_cpu(fe->lengthExtendedAttr);
-
-       if ((*offset > 0) && (*offset < le32_to_cpu(fe->lengthAllocDescs)))
-               ptr += *offset;
-
-       ext = (struct extent_ad *)ptr;
-
-       *offset = *offset + sizeof(struct extent_ad);
-       return ext;
-}
-#endif
-
 struct short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offset,
                              int inc)
 {
index 7464305382b5e1d287cc6a435d1d60c077a0948d..b80cbd78833cf7aa99430016b84f29b038d5e098 100644 (file)
@@ -193,9 +193,11 @@ int udf_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
 static int udf_release_file(struct inode *inode, struct file *filp)
 {
        if (filp->f_mode & FMODE_WRITE) {
+               mutex_lock(&inode->i_mutex);
                lock_kernel();
                udf_discard_prealloc(inode);
                unlock_kernel();
+               mutex_unlock(&inode->i_mutex);
        }
        return 0;
 }
index e7533f7856368d17a15728c5113e816546cff4e7..6d24c2c63f9353c7baf7e9c7158360c1ef40a9f4 100644 (file)
@@ -90,19 +90,16 @@ no_delete:
 }
 
 /*
- * If we are going to release inode from memory, we discard preallocation and
- * truncate last inode extent to proper length. We could use drop_inode() but
- * it's called under inode_lock and thus we cannot mark inode dirty there.  We
- * use clear_inode() but we have to make sure to write inode as it's not written
- * automatically.
+ * If we are going to release inode from memory, we truncate last inode extent
+ * to proper length. We could use drop_inode() but it's called under inode_lock
+ * and thus we cannot mark inode dirty there.  We use clear_inode() but we have
+ * to make sure to write inode as it's not written automatically.
  */
 void udf_clear_inode(struct inode *inode)
 {
        struct udf_inode_info *iinfo;
        if (!(inode->i_sb->s_flags & MS_RDONLY)) {
                lock_kernel();
-               /* Discard preallocation for directories, symlinks, etc. */
-               udf_discard_prealloc(inode);
                udf_truncate_tail_extent(inode);
                unlock_kernel();
                write_inode_now(inode, 0);
@@ -664,8 +661,12 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
        udf_split_extents(inode, &c, offset, newblocknum, laarr, &endnum);
 
 #ifdef UDF_PREALLOCATE
-       /* preallocate blocks */
-       udf_prealloc_extents(inode, c, lastblock, laarr, &endnum);
+       /* 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 */
index 1b88fd5df05d6d7f6694a3d9284162d4ed386a0b..43e24a3b8e10422674746888120c1ca180a9c4d8 100644 (file)
@@ -36,14 +36,10 @@ unsigned int udf_get_last_session(struct super_block *sb)
        ms_info.addr_format = CDROM_LBA;
        i = ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long)&ms_info);
 
-#define WE_OBEY_THE_WRITTEN_STANDARDS 1
-
        if (i == 0) {
                udf_debug("XA disk: %s, vol_desc_start=%d\n",
                          (ms_info.xa_flag ? "yes" : "no"), ms_info.addr.lba);
-#if WE_OBEY_THE_WRITTEN_STANDARDS
                if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
-#endif
                        vol_desc_start = ms_info.addr.lba;
        } else {
                udf_debug("CDROMMULTISESSION not supported: rc=%d\n", i);
index 6a29fa34c478490cc45732af39072e78fee180e0..21dad8c608f955bfac8933e7fea665f0e67a8491 100644 (file)
@@ -943,7 +943,6 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry,
                pc->componentType = 1;
                pc->lengthComponentIdent = 0;
                pc->componentFileVersionNum = 0;
-               pc += sizeof(struct pathComponent);
                elen += sizeof(struct pathComponent);
        }