2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* linux/fs/ext2/dir.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1992, 1993, 1994, 1995
|
|
|
|
* Remy Card (card@masi.ibp.fr)
|
|
|
|
* Laboratoire MASI - Institut Blaise Pascal
|
|
|
|
* Universite Pierre et Marie Curie (Paris VI)
|
|
|
|
*
|
|
|
|
* from
|
|
|
|
*
|
|
|
|
* linux/fs/minix/dir.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*
|
|
|
|
* ext2 directory handling functions
|
|
|
|
*
|
|
|
|
* Big-endian to little-endian byte-swapping/bitmaps by
|
|
|
|
* David S. Miller (davem@caip.rutgers.edu), 1995
|
|
|
|
*
|
|
|
|
* All code that works with directory layout had been switched to pagecache
|
|
|
|
* and moved here. AV
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "ext2.h"
|
2007-10-16 16:25:04 +08:00
|
|
|
#include <linux/buffer_head.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/pagemap.h>
|
2007-10-16 16:25:04 +08:00
|
|
|
#include <linux/swap.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
typedef struct ext2_dir_entry_2 ext2_dirent;
|
|
|
|
|
2010-12-08 01:51:05 +08:00
|
|
|
/*
|
|
|
|
* Tests against MAX_REC_LEN etc were put in place for 64k block
|
|
|
|
* sizes; if that is not possible on this arch, we can skip
|
|
|
|
* those tests and speed things up.
|
|
|
|
*/
|
2007-10-22 07:41:40 +08:00
|
|
|
static inline unsigned ext2_rec_len_from_disk(__le16 dlen)
|
|
|
|
{
|
|
|
|
unsigned len = le16_to_cpu(dlen);
|
|
|
|
|
2016-04-01 20:29:48 +08:00
|
|
|
#if (PAGE_SIZE >= 65536)
|
2007-10-22 07:41:40 +08:00
|
|
|
if (len == EXT2_MAX_REC_LEN)
|
|
|
|
return 1 << 16;
|
2010-12-08 01:51:05 +08:00
|
|
|
#endif
|
2007-10-22 07:41:40 +08:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline __le16 ext2_rec_len_to_disk(unsigned len)
|
|
|
|
{
|
2016-04-01 20:29:48 +08:00
|
|
|
#if (PAGE_SIZE >= 65536)
|
2007-10-22 07:41:40 +08:00
|
|
|
if (len == (1 << 16))
|
|
|
|
return cpu_to_le16(EXT2_MAX_REC_LEN);
|
2008-04-28 17:16:02 +08:00
|
|
|
else
|
|
|
|
BUG_ON(len > (1 << 16));
|
2010-12-08 01:51:05 +08:00
|
|
|
#endif
|
2007-10-22 07:41:40 +08:00
|
|
|
return cpu_to_le16(len);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* ext2 uses block-sized chunks. Arguably, sector-sized ones would be
|
|
|
|
* more robust, but we have what we have
|
|
|
|
*/
|
|
|
|
static inline unsigned ext2_chunk_size(struct inode *inode)
|
|
|
|
{
|
|
|
|
return inode->i_sb->s_blocksize;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void ext2_put_page(struct page *page)
|
|
|
|
{
|
|
|
|
kunmap(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
put_page(page);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the offset into page `page_nr' of the last valid
|
|
|
|
* byte in that page, plus one.
|
|
|
|
*/
|
|
|
|
static unsigned
|
|
|
|
ext2_last_byte(struct inode *inode, unsigned long page_nr)
|
|
|
|
{
|
|
|
|
unsigned last_byte = inode->i_size;
|
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
last_byte -= page_nr << PAGE_SHIFT;
|
|
|
|
if (last_byte > PAGE_SIZE)
|
|
|
|
last_byte = PAGE_SIZE;
|
2005-04-17 06:20:36 +08:00
|
|
|
return last_byte;
|
|
|
|
}
|
|
|
|
|
2007-10-16 16:25:04 +08:00
|
|
|
static int ext2_commit_chunk(struct page *page, loff_t pos, unsigned len)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-10-16 16:25:04 +08:00
|
|
|
struct address_space *mapping = page->mapping;
|
|
|
|
struct inode *dir = mapping->host;
|
2005-04-17 06:20:36 +08:00
|
|
|
int err = 0;
|
2007-10-16 16:25:04 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
dir->i_version++;
|
2007-10-16 16:25:04 +08:00
|
|
|
block_write_end(NULL, mapping, pos, len, len, page, NULL);
|
|
|
|
|
|
|
|
if (pos+len > dir->i_size) {
|
|
|
|
i_size_write(dir, pos+len);
|
|
|
|
mark_inode_dirty(dir);
|
|
|
|
}
|
|
|
|
|
2009-01-16 05:51:29 +08:00
|
|
|
if (IS_DIRSYNC(dir)) {
|
2017-07-06 03:26:48 +08:00
|
|
|
err = write_one_page(page);
|
2009-01-16 05:51:29 +08:00
|
|
|
if (!err)
|
2010-10-06 16:48:20 +08:00
|
|
|
err = sync_inode_metadata(dir, 1);
|
2009-01-16 05:51:29 +08:00
|
|
|
} else {
|
2005-04-17 06:20:36 +08:00
|
|
|
unlock_page(page);
|
2009-01-16 05:51:29 +08:00
|
|
|
}
|
2007-10-16 16:25:04 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2016-04-23 03:06:44 +08:00
|
|
|
static bool ext2_check_page(struct page *page, int quiet)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct inode *dir = page->mapping->host;
|
|
|
|
struct super_block *sb = dir->i_sb;
|
|
|
|
unsigned chunk_size = ext2_chunk_size(dir);
|
|
|
|
char *kaddr = page_address(page);
|
|
|
|
u32 max_inumber = le32_to_cpu(EXT2_SB(sb)->s_es->s_inodes_count);
|
|
|
|
unsigned offs, rec_len;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
unsigned limit = PAGE_SIZE;
|
2005-04-17 06:20:36 +08:00
|
|
|
ext2_dirent *p;
|
|
|
|
char *error;
|
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
if ((dir->i_size >> PAGE_SHIFT) == page->index) {
|
|
|
|
limit = dir->i_size & ~PAGE_MASK;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (limit & (chunk_size - 1))
|
|
|
|
goto Ebadsize;
|
|
|
|
if (!limit)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
for (offs = 0; offs <= limit - EXT2_DIR_REC_LEN(1); offs += rec_len) {
|
|
|
|
p = (ext2_dirent *)(kaddr + offs);
|
2007-10-22 07:41:40 +08:00
|
|
|
rec_len = ext2_rec_len_from_disk(p->rec_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-12-08 01:51:05 +08:00
|
|
|
if (unlikely(rec_len < EXT2_DIR_REC_LEN(1)))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto Eshort;
|
2010-12-08 01:51:05 +08:00
|
|
|
if (unlikely(rec_len & 3))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto Ealign;
|
2010-12-08 01:51:05 +08:00
|
|
|
if (unlikely(rec_len < EXT2_DIR_REC_LEN(p->name_len)))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto Enamelen;
|
2010-12-08 01:51:05 +08:00
|
|
|
if (unlikely(((offs + rec_len - 1) ^ offs) & ~(chunk_size-1)))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto Espan;
|
2010-12-08 01:51:05 +08:00
|
|
|
if (unlikely(le32_to_cpu(p->inode) > max_inumber))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto Einumber;
|
|
|
|
}
|
|
|
|
if (offs != limit)
|
|
|
|
goto Eend;
|
|
|
|
out:
|
|
|
|
SetPageChecked(page);
|
2016-04-23 03:06:44 +08:00
|
|
|
return true;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Too bad, we had an error */
|
|
|
|
|
|
|
|
Ebadsize:
|
2008-10-16 13:04:02 +08:00
|
|
|
if (!quiet)
|
|
|
|
ext2_error(sb, __func__,
|
|
|
|
"size of directory #%lu is not a multiple "
|
|
|
|
"of chunk size", dir->i_ino);
|
2005-04-17 06:20:36 +08:00
|
|
|
goto fail;
|
|
|
|
Eshort:
|
|
|
|
error = "rec_len is smaller than minimal";
|
|
|
|
goto bad_entry;
|
|
|
|
Ealign:
|
|
|
|
error = "unaligned directory entry";
|
|
|
|
goto bad_entry;
|
|
|
|
Enamelen:
|
|
|
|
error = "rec_len is too small for name_len";
|
|
|
|
goto bad_entry;
|
|
|
|
Espan:
|
|
|
|
error = "directory entry across blocks";
|
|
|
|
goto bad_entry;
|
|
|
|
Einumber:
|
|
|
|
error = "inode out of bounds";
|
|
|
|
bad_entry:
|
2008-10-16 13:04:02 +08:00
|
|
|
if (!quiet)
|
|
|
|
ext2_error(sb, __func__, "bad entry in directory #%lu: : %s - "
|
|
|
|
"offset=%lu, inode=%lu, rec_len=%d, name_len=%d",
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs,
|
2008-10-16 13:04:02 +08:00
|
|
|
(unsigned long) le32_to_cpu(p->inode),
|
|
|
|
rec_len, p->name_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
goto fail;
|
|
|
|
Eend:
|
2008-10-16 13:04:02 +08:00
|
|
|
if (!quiet) {
|
|
|
|
p = (ext2_dirent *)(kaddr + offs);
|
|
|
|
ext2_error(sb, "ext2_check_page",
|
|
|
|
"entry in directory #%lu spans the page boundary"
|
|
|
|
"offset=%lu, inode=%lu",
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
dir->i_ino, (page->index<<PAGE_SHIFT)+offs,
|
2008-10-16 13:04:02 +08:00
|
|
|
(unsigned long) le32_to_cpu(p->inode));
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
fail:
|
|
|
|
SetPageError(page);
|
2016-04-23 03:06:44 +08:00
|
|
|
return false;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-10-16 13:04:02 +08:00
|
|
|
static struct page * ext2_get_page(struct inode *dir, unsigned long n,
|
|
|
|
int quiet)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct address_space *mapping = dir->i_mapping;
|
2006-06-23 17:05:08 +08:00
|
|
|
struct page *page = read_mapping_page(mapping, n, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!IS_ERR(page)) {
|
|
|
|
kmap(page);
|
2016-04-23 03:06:44 +08:00
|
|
|
if (unlikely(!PageChecked(page))) {
|
|
|
|
if (PageError(page) || !ext2_check_page(page, quiet))
|
|
|
|
goto fail;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
return page;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
ext2_put_page(page);
|
|
|
|
return ERR_PTR(-EIO);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NOTE! unlike strncmp, ext2_match returns 1 for success, 0 for failure.
|
|
|
|
*
|
|
|
|
* len <= EXT2_NAME_LEN and de != NULL are guaranteed by caller.
|
|
|
|
*/
|
|
|
|
static inline int ext2_match (int len, const char * const name,
|
|
|
|
struct ext2_dir_entry_2 * de)
|
|
|
|
{
|
|
|
|
if (len != de->name_len)
|
|
|
|
return 0;
|
|
|
|
if (!de->inode)
|
|
|
|
return 0;
|
|
|
|
return !memcmp(name, de->name, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* p is at least 6 bytes before the end of page
|
|
|
|
*/
|
|
|
|
static inline ext2_dirent *ext2_next_entry(ext2_dirent *p)
|
|
|
|
{
|
2007-10-22 07:41:40 +08:00
|
|
|
return (ext2_dirent *)((char *)p +
|
|
|
|
ext2_rec_len_from_disk(p->rec_len));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned
|
|
|
|
ext2_validate_entry(char *base, unsigned offset, unsigned mask)
|
|
|
|
{
|
|
|
|
ext2_dirent *de = (ext2_dirent*)(base + offset);
|
|
|
|
ext2_dirent *p = (ext2_dirent*)(base + (offset&mask));
|
|
|
|
while ((char*)p < (char*)de) {
|
|
|
|
if (p->rec_len == 0)
|
|
|
|
break;
|
|
|
|
p = ext2_next_entry(p);
|
|
|
|
}
|
|
|
|
return (char *)p - base;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned char ext2_filetype_table[EXT2_FT_MAX] = {
|
|
|
|
[EXT2_FT_UNKNOWN] = DT_UNKNOWN,
|
|
|
|
[EXT2_FT_REG_FILE] = DT_REG,
|
|
|
|
[EXT2_FT_DIR] = DT_DIR,
|
|
|
|
[EXT2_FT_CHRDEV] = DT_CHR,
|
|
|
|
[EXT2_FT_BLKDEV] = DT_BLK,
|
|
|
|
[EXT2_FT_FIFO] = DT_FIFO,
|
|
|
|
[EXT2_FT_SOCK] = DT_SOCK,
|
|
|
|
[EXT2_FT_SYMLINK] = DT_LNK,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define S_SHIFT 12
|
|
|
|
static unsigned char ext2_type_by_mode[S_IFMT >> S_SHIFT] = {
|
|
|
|
[S_IFREG >> S_SHIFT] = EXT2_FT_REG_FILE,
|
|
|
|
[S_IFDIR >> S_SHIFT] = EXT2_FT_DIR,
|
|
|
|
[S_IFCHR >> S_SHIFT] = EXT2_FT_CHRDEV,
|
|
|
|
[S_IFBLK >> S_SHIFT] = EXT2_FT_BLKDEV,
|
|
|
|
[S_IFIFO >> S_SHIFT] = EXT2_FT_FIFO,
|
|
|
|
[S_IFSOCK >> S_SHIFT] = EXT2_FT_SOCK,
|
|
|
|
[S_IFLNK >> S_SHIFT] = EXT2_FT_SYMLINK,
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline void ext2_set_de_type(ext2_dirent *de, struct inode *inode)
|
|
|
|
{
|
2011-07-26 14:46:18 +08:00
|
|
|
umode_t mode = inode->i_mode;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (EXT2_HAS_INCOMPAT_FEATURE(inode->i_sb, EXT2_FEATURE_INCOMPAT_FILETYPE))
|
|
|
|
de->file_type = ext2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
|
|
|
|
else
|
|
|
|
de->file_type = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-05-16 06:51:49 +08:00
|
|
|
ext2_readdir(struct file *file, struct dir_context *ctx)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2013-05-16 06:51:49 +08:00
|
|
|
loff_t pos = ctx->pos;
|
|
|
|
struct inode *inode = file_inode(file);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct super_block *sb = inode->i_sb;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
unsigned int offset = pos & ~PAGE_MASK;
|
|
|
|
unsigned long n = pos >> PAGE_SHIFT;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long npages = dir_pages(inode);
|
|
|
|
unsigned chunk_mask = ~(ext2_chunk_size(inode)-1);
|
|
|
|
unsigned char *types = NULL;
|
2013-05-16 06:51:49 +08:00
|
|
|
int need_revalidate = file->f_version != inode->i_version;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (pos > inode->i_size - EXT2_DIR_REC_LEN(1))
|
2006-03-16 05:41:59 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (EXT2_HAS_INCOMPAT_FEATURE(sb, EXT2_FEATURE_INCOMPAT_FILETYPE))
|
|
|
|
types = ext2_filetype_table;
|
|
|
|
|
|
|
|
for ( ; n < npages; n++, offset = 0) {
|
|
|
|
char *kaddr, *limit;
|
|
|
|
ext2_dirent *de;
|
2008-10-16 13:04:02 +08:00
|
|
|
struct page *page = ext2_get_page(inode, n, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (IS_ERR(page)) {
|
2008-04-28 17:16:03 +08:00
|
|
|
ext2_error(sb, __func__,
|
2005-04-17 06:20:36 +08:00
|
|
|
"bad page in #%lu",
|
|
|
|
inode->i_ino);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
ctx->pos += PAGE_SIZE - offset;
|
2008-04-28 17:16:00 +08:00
|
|
|
return PTR_ERR(page);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
kaddr = page_address(page);
|
2006-03-16 05:41:59 +08:00
|
|
|
if (unlikely(need_revalidate)) {
|
|
|
|
if (offset) {
|
|
|
|
offset = ext2_validate_entry(kaddr, offset, chunk_mask);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
ctx->pos = (n<<PAGE_SHIFT) + offset;
|
2006-03-16 05:41:59 +08:00
|
|
|
}
|
2013-05-16 06:51:49 +08:00
|
|
|
file->f_version = inode->i_version;
|
2005-04-17 06:20:36 +08:00
|
|
|
need_revalidate = 0;
|
|
|
|
}
|
|
|
|
de = (ext2_dirent *)(kaddr+offset);
|
|
|
|
limit = kaddr + ext2_last_byte(inode, n) - EXT2_DIR_REC_LEN(1);
|
|
|
|
for ( ;(char*)de <= limit; de = ext2_next_entry(de)) {
|
|
|
|
if (de->rec_len == 0) {
|
2008-04-28 17:16:03 +08:00
|
|
|
ext2_error(sb, __func__,
|
2005-04-17 06:20:36 +08:00
|
|
|
"zero-length directory entry");
|
|
|
|
ext2_put_page(page);
|
2006-03-16 05:41:59 +08:00
|
|
|
return -EIO;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (de->inode) {
|
|
|
|
unsigned char d_type = DT_UNKNOWN;
|
|
|
|
|
|
|
|
if (types && de->file_type < EXT2_FT_MAX)
|
|
|
|
d_type = types[de->file_type];
|
|
|
|
|
2013-05-16 06:51:49 +08:00
|
|
|
if (!dir_emit(ctx, de->name, de->name_len,
|
|
|
|
le32_to_cpu(de->inode),
|
|
|
|
d_type)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
ext2_put_page(page);
|
2006-03-16 05:41:59 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
2013-05-16 06:51:49 +08:00
|
|
|
ctx->pos += ext2_rec_len_from_disk(de->rec_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
ext2_put_page(page);
|
|
|
|
}
|
2006-03-16 05:41:59 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ext2_find_entry()
|
|
|
|
*
|
|
|
|
* finds an entry in the specified directory with the wanted name. It
|
2009-12-01 00:58:43 +08:00
|
|
|
* returns the page in which the entry was found (as a parameter - res_page),
|
|
|
|
* and the entry itself. Page is returned mapped and unlocked.
|
2005-04-17 06:20:36 +08:00
|
|
|
* Entry is guaranteed to be valid.
|
|
|
|
*/
|
2016-07-21 10:47:26 +08:00
|
|
|
struct ext2_dir_entry_2 *ext2_find_entry (struct inode *dir,
|
|
|
|
const struct qstr *child, struct page **res_page)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-08-24 19:28:39 +08:00
|
|
|
const char *name = child->name;
|
|
|
|
int namelen = child->len;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned reclen = EXT2_DIR_REC_LEN(namelen);
|
|
|
|
unsigned long start, n;
|
|
|
|
unsigned long npages = dir_pages(dir);
|
|
|
|
struct page *page = NULL;
|
|
|
|
struct ext2_inode_info *ei = EXT2_I(dir);
|
|
|
|
ext2_dirent * de;
|
2008-10-16 13:04:02 +08:00
|
|
|
int dir_has_error = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (npages == 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* OFFSET_CACHE */
|
|
|
|
*res_page = NULL;
|
|
|
|
|
|
|
|
start = ei->i_dir_start_lookup;
|
|
|
|
if (start >= npages)
|
|
|
|
start = 0;
|
|
|
|
n = start;
|
|
|
|
do {
|
|
|
|
char *kaddr;
|
2008-10-16 13:04:02 +08:00
|
|
|
page = ext2_get_page(dir, n, dir_has_error);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!IS_ERR(page)) {
|
|
|
|
kaddr = page_address(page);
|
|
|
|
de = (ext2_dirent *) kaddr;
|
|
|
|
kaddr += ext2_last_byte(dir, n) - reclen;
|
|
|
|
while ((char *) de <= kaddr) {
|
|
|
|
if (de->rec_len == 0) {
|
2008-04-28 17:16:03 +08:00
|
|
|
ext2_error(dir->i_sb, __func__,
|
2005-04-17 06:20:36 +08:00
|
|
|
"zero-length directory entry");
|
|
|
|
ext2_put_page(page);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (ext2_match (namelen, name, de))
|
|
|
|
goto found;
|
|
|
|
de = ext2_next_entry(de);
|
|
|
|
}
|
|
|
|
ext2_put_page(page);
|
2008-10-16 13:04:02 +08:00
|
|
|
} else
|
|
|
|
dir_has_error = 1;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (++n >= npages)
|
|
|
|
n = 0;
|
2007-02-10 17:45:06 +08:00
|
|
|
/* next page is past the blocks we've got */
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
if (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) {
|
2008-04-28 17:16:03 +08:00
|
|
|
ext2_error(dir->i_sb, __func__,
|
2007-02-10 17:45:06 +08:00
|
|
|
"dir %lu size %lld exceeds block count %llu",
|
|
|
|
dir->i_ino, dir->i_size,
|
|
|
|
(unsigned long long)dir->i_blocks);
|
|
|
|
goto out;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
} while (n != start);
|
|
|
|
out:
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
found:
|
|
|
|
*res_page = page;
|
|
|
|
ei->i_dir_start_lookup = n;
|
|
|
|
return de;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct ext2_dir_entry_2 * ext2_dotdot (struct inode *dir, struct page **p)
|
|
|
|
{
|
2008-10-16 13:04:02 +08:00
|
|
|
struct page *page = ext2_get_page(dir, 0, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
ext2_dirent *de = NULL;
|
|
|
|
|
|
|
|
if (!IS_ERR(page)) {
|
|
|
|
de = ext2_next_entry((ext2_dirent *) page_address(page));
|
|
|
|
*p = page;
|
|
|
|
}
|
|
|
|
return de;
|
|
|
|
}
|
|
|
|
|
2016-07-21 10:47:26 +08:00
|
|
|
ino_t ext2_inode_by_name(struct inode *dir, const struct qstr *child)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
ino_t res = 0;
|
2008-08-24 19:28:39 +08:00
|
|
|
struct ext2_dir_entry_2 *de;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct page *page;
|
|
|
|
|
2008-08-24 19:28:39 +08:00
|
|
|
de = ext2_find_entry (dir, child, &page);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (de) {
|
|
|
|
res = le32_to_cpu(de->inode);
|
2006-06-25 20:49:27 +08:00
|
|
|
ext2_put_page(page);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2010-06-04 17:29:56 +08:00
|
|
|
static int ext2_prepare_chunk(struct page *page, loff_t pos, unsigned len)
|
|
|
|
{
|
2010-06-04 17:29:57 +08:00
|
|
|
return __block_write_begin(page, pos, len, ext2_get_block);
|
2010-06-04 17:29:56 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Releases the page */
|
|
|
|
void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
|
ext2: Do not update mtime of a moved directory
One of our users is complaining that his backup tool is upset on ext2
(while it's happy on ext3, xfs, ...) because of the mtime change.
The problem is:
mkdir foo
mkdir bar
mkdir foo/a
Now under ext2:
mv foo/a foo/b
changes mtime of 'foo/a' (foo/b after the move). That does not really
make sense and it does not happen under any other filesystem I've seen.
More complicated is:
mv foo/a bar/a
This changes mtime of foo/a (bar/a after the move) and it makes some
sense since we had to update parent directory pointer of foo/a. But
again, no other filesystem does this. So after some thoughts I'd vote
for consistency and change ext2 to behave the same as other filesystems.
Do not update mtime of a moved directory. Specs don't say anything
about it (neither that it should, nor that it should not be updated) and
other common filesystems (ext3, ext4, xfs, reiserfs, fat, ...) don't do
it. So let's become more consistent.
Spotted by ronny.pretzsch@dfs.de, initial fix by Jörn Engel.
Reported-by: <ronny.pretzsch@dfs.de>
Cc: <hare@suse.de>
Cc: Jörn Engel <joern@logfs.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-06-18 07:26:20 +08:00
|
|
|
struct page *page, struct inode *inode, int update_times)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-10-16 16:25:04 +08:00
|
|
|
loff_t pos = page_offset(page) +
|
|
|
|
(char *) de - (char *) page_address(page);
|
2007-10-22 07:41:40 +08:00
|
|
|
unsigned len = ext2_rec_len_from_disk(de->rec_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
int err;
|
|
|
|
|
|
|
|
lock_page(page);
|
2010-06-04 17:29:56 +08:00
|
|
|
err = ext2_prepare_chunk(page, pos, len);
|
2006-03-27 00:27:41 +08:00
|
|
|
BUG_ON(err);
|
2005-04-17 06:20:36 +08:00
|
|
|
de->inode = cpu_to_le32(inode->i_ino);
|
2007-10-16 16:25:04 +08:00
|
|
|
ext2_set_de_type(de, inode);
|
|
|
|
err = ext2_commit_chunk(page, pos, len);
|
2005-04-17 06:20:36 +08:00
|
|
|
ext2_put_page(page);
|
ext2: Do not update mtime of a moved directory
One of our users is complaining that his backup tool is upset on ext2
(while it's happy on ext3, xfs, ...) because of the mtime change.
The problem is:
mkdir foo
mkdir bar
mkdir foo/a
Now under ext2:
mv foo/a foo/b
changes mtime of 'foo/a' (foo/b after the move). That does not really
make sense and it does not happen under any other filesystem I've seen.
More complicated is:
mv foo/a bar/a
This changes mtime of foo/a (bar/a after the move) and it makes some
sense since we had to update parent directory pointer of foo/a. But
again, no other filesystem does this. So after some thoughts I'd vote
for consistency and change ext2 to behave the same as other filesystems.
Do not update mtime of a moved directory. Specs don't say anything
about it (neither that it should, nor that it should not be updated) and
other common filesystems (ext3, ext4, xfs, reiserfs, fat, ...) don't do
it. So let's become more consistent.
Spotted by ronny.pretzsch@dfs.de, initial fix by Jörn Engel.
Reported-by: <ronny.pretzsch@dfs.de>
Cc: <hare@suse.de>
Cc: Jörn Engel <joern@logfs.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-06-18 07:26:20 +08:00
|
|
|
if (update_times)
|
2016-09-14 22:48:05 +08:00
|
|
|
dir->i_mtime = dir->i_ctime = current_time(dir);
|
2005-04-17 06:20:36 +08:00
|
|
|
EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
|
|
|
|
mark_inode_dirty(dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parent is locked.
|
|
|
|
*/
|
|
|
|
int ext2_add_link (struct dentry *dentry, struct inode *inode)
|
|
|
|
{
|
2015-03-18 06:25:59 +08:00
|
|
|
struct inode *dir = d_inode(dentry->d_parent);
|
2005-04-17 06:20:36 +08:00
|
|
|
const char *name = dentry->d_name.name;
|
|
|
|
int namelen = dentry->d_name.len;
|
|
|
|
unsigned chunk_size = ext2_chunk_size(dir);
|
|
|
|
unsigned reclen = EXT2_DIR_REC_LEN(namelen);
|
|
|
|
unsigned short rec_len, name_len;
|
|
|
|
struct page *page = NULL;
|
|
|
|
ext2_dirent * de;
|
|
|
|
unsigned long npages = dir_pages(dir);
|
|
|
|
unsigned long n;
|
|
|
|
char *kaddr;
|
2007-10-16 16:25:04 +08:00
|
|
|
loff_t pos;
|
2005-04-17 06:20:36 +08:00
|
|
|
int err;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We take care of directory expansion in the same loop.
|
|
|
|
* This code plays outside i_size, so it locks the page
|
|
|
|
* to protect that region.
|
|
|
|
*/
|
|
|
|
for (n = 0; n <= npages; n++) {
|
|
|
|
char *dir_end;
|
|
|
|
|
2008-10-16 13:04:02 +08:00
|
|
|
page = ext2_get_page(dir, n, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
err = PTR_ERR(page);
|
|
|
|
if (IS_ERR(page))
|
|
|
|
goto out;
|
|
|
|
lock_page(page);
|
|
|
|
kaddr = page_address(page);
|
|
|
|
dir_end = kaddr + ext2_last_byte(dir, n);
|
|
|
|
de = (ext2_dirent *)kaddr;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
kaddr += PAGE_SIZE - reclen;
|
2005-04-17 06:20:36 +08:00
|
|
|
while ((char *)de <= kaddr) {
|
|
|
|
if ((char *)de == dir_end) {
|
|
|
|
/* We hit i_size */
|
|
|
|
name_len = 0;
|
|
|
|
rec_len = chunk_size;
|
2007-10-22 07:41:40 +08:00
|
|
|
de->rec_len = ext2_rec_len_to_disk(chunk_size);
|
2005-04-17 06:20:36 +08:00
|
|
|
de->inode = 0;
|
|
|
|
goto got_it;
|
|
|
|
}
|
|
|
|
if (de->rec_len == 0) {
|
2008-04-28 17:16:03 +08:00
|
|
|
ext2_error(dir->i_sb, __func__,
|
2005-04-17 06:20:36 +08:00
|
|
|
"zero-length directory entry");
|
|
|
|
err = -EIO;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
err = -EEXIST;
|
|
|
|
if (ext2_match (namelen, name, de))
|
|
|
|
goto out_unlock;
|
|
|
|
name_len = EXT2_DIR_REC_LEN(de->name_len);
|
2007-10-22 07:41:40 +08:00
|
|
|
rec_len = ext2_rec_len_from_disk(de->rec_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!de->inode && rec_len >= reclen)
|
|
|
|
goto got_it;
|
|
|
|
if (rec_len >= name_len + reclen)
|
|
|
|
goto got_it;
|
|
|
|
de = (ext2_dirent *) ((char *) de + rec_len);
|
|
|
|
}
|
|
|
|
unlock_page(page);
|
|
|
|
ext2_put_page(page);
|
|
|
|
}
|
|
|
|
BUG();
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
got_it:
|
2007-10-16 16:25:04 +08:00
|
|
|
pos = page_offset(page) +
|
|
|
|
(char*)de - (char*)page_address(page);
|
2010-06-04 17:29:56 +08:00
|
|
|
err = ext2_prepare_chunk(page, pos, rec_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (err)
|
|
|
|
goto out_unlock;
|
|
|
|
if (de->inode) {
|
|
|
|
ext2_dirent *de1 = (ext2_dirent *) ((char *) de + name_len);
|
2007-10-22 07:41:40 +08:00
|
|
|
de1->rec_len = ext2_rec_len_to_disk(rec_len - name_len);
|
|
|
|
de->rec_len = ext2_rec_len_to_disk(name_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
de = de1;
|
|
|
|
}
|
|
|
|
de->name_len = namelen;
|
2007-10-16 16:25:04 +08:00
|
|
|
memcpy(de->name, name, namelen);
|
2005-04-17 06:20:36 +08:00
|
|
|
de->inode = cpu_to_le32(inode->i_ino);
|
|
|
|
ext2_set_de_type (de, inode);
|
2007-10-16 16:25:04 +08:00
|
|
|
err = ext2_commit_chunk(page, pos, rec_len);
|
2016-09-14 22:48:05 +08:00
|
|
|
dir->i_mtime = dir->i_ctime = current_time(dir);
|
2005-04-17 06:20:36 +08:00
|
|
|
EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
|
|
|
|
mark_inode_dirty(dir);
|
|
|
|
/* OFFSET_CACHE */
|
|
|
|
out_put:
|
|
|
|
ext2_put_page(page);
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
out_unlock:
|
|
|
|
unlock_page(page);
|
|
|
|
goto out_put;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ext2_delete_entry deletes a directory entry by merging it with the
|
|
|
|
* previous entry. Page is up-to-date. Releases the page.
|
|
|
|
*/
|
|
|
|
int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
|
|
|
|
{
|
2010-06-04 17:29:56 +08:00
|
|
|
struct inode *inode = page->mapping->host;
|
2005-04-17 06:20:36 +08:00
|
|
|
char *kaddr = page_address(page);
|
|
|
|
unsigned from = ((char*)dir - kaddr) & ~(ext2_chunk_size(inode)-1);
|
2007-10-22 07:41:40 +08:00
|
|
|
unsigned to = ((char *)dir - kaddr) +
|
|
|
|
ext2_rec_len_from_disk(dir->rec_len);
|
2007-10-16 16:25:04 +08:00
|
|
|
loff_t pos;
|
2005-04-17 06:20:36 +08:00
|
|
|
ext2_dirent * pde = NULL;
|
|
|
|
ext2_dirent * de = (ext2_dirent *) (kaddr + from);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
while ((char*)de < (char*)dir) {
|
|
|
|
if (de->rec_len == 0) {
|
2008-04-28 17:16:03 +08:00
|
|
|
ext2_error(inode->i_sb, __func__,
|
2005-04-17 06:20:36 +08:00
|
|
|
"zero-length directory entry");
|
|
|
|
err = -EIO;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
pde = de;
|
|
|
|
de = ext2_next_entry(de);
|
|
|
|
}
|
|
|
|
if (pde)
|
|
|
|
from = (char*)pde - (char*)page_address(page);
|
2007-10-16 16:25:04 +08:00
|
|
|
pos = page_offset(page) + from;
|
2005-04-17 06:20:36 +08:00
|
|
|
lock_page(page);
|
2010-06-04 17:29:56 +08:00
|
|
|
err = ext2_prepare_chunk(page, pos, to - from);
|
2006-03-27 00:27:41 +08:00
|
|
|
BUG_ON(err);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (pde)
|
2007-10-22 07:41:40 +08:00
|
|
|
pde->rec_len = ext2_rec_len_to_disk(to - from);
|
2005-04-17 06:20:36 +08:00
|
|
|
dir->inode = 0;
|
2007-10-16 16:25:04 +08:00
|
|
|
err = ext2_commit_chunk(page, pos, to - from);
|
2016-09-14 22:48:05 +08:00
|
|
|
inode->i_ctime = inode->i_mtime = current_time(inode);
|
2005-04-17 06:20:36 +08:00
|
|
|
EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
out:
|
|
|
|
ext2_put_page(page);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the first fragment of directory.
|
|
|
|
*/
|
|
|
|
int ext2_make_empty(struct inode *inode, struct inode *parent)
|
|
|
|
{
|
2010-06-04 17:29:56 +08:00
|
|
|
struct page *page = grab_cache_page(inode->i_mapping, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned chunk_size = ext2_chunk_size(inode);
|
|
|
|
struct ext2_dir_entry_2 * de;
|
|
|
|
int err;
|
|
|
|
void *kaddr;
|
|
|
|
|
|
|
|
if (!page)
|
|
|
|
return -ENOMEM;
|
2007-10-16 16:25:04 +08:00
|
|
|
|
2010-06-04 17:29:56 +08:00
|
|
|
err = ext2_prepare_chunk(page, 0, chunk_size);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (err) {
|
|
|
|
unlock_page(page);
|
|
|
|
goto fail;
|
|
|
|
}
|
2011-11-25 23:14:29 +08:00
|
|
|
kaddr = kmap_atomic(page);
|
2006-01-11 08:38:27 +08:00
|
|
|
memset(kaddr, 0, chunk_size);
|
2005-04-17 06:20:36 +08:00
|
|
|
de = (struct ext2_dir_entry_2 *)kaddr;
|
|
|
|
de->name_len = 1;
|
2007-10-22 07:41:40 +08:00
|
|
|
de->rec_len = ext2_rec_len_to_disk(EXT2_DIR_REC_LEN(1));
|
2005-04-17 06:20:36 +08:00
|
|
|
memcpy (de->name, ".\0\0", 4);
|
|
|
|
de->inode = cpu_to_le32(inode->i_ino);
|
|
|
|
ext2_set_de_type (de, inode);
|
|
|
|
|
|
|
|
de = (struct ext2_dir_entry_2 *)(kaddr + EXT2_DIR_REC_LEN(1));
|
|
|
|
de->name_len = 2;
|
2007-10-22 07:41:40 +08:00
|
|
|
de->rec_len = ext2_rec_len_to_disk(chunk_size - EXT2_DIR_REC_LEN(1));
|
2005-04-17 06:20:36 +08:00
|
|
|
de->inode = cpu_to_le32(parent->i_ino);
|
|
|
|
memcpy (de->name, "..\0", 4);
|
|
|
|
ext2_set_de_type (de, inode);
|
2011-11-25 23:14:29 +08:00
|
|
|
kunmap_atomic(kaddr);
|
2005-04-17 06:20:36 +08:00
|
|
|
err = ext2_commit_chunk(page, 0, chunk_size);
|
|
|
|
fail:
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
put_page(page);
|
2005-04-17 06:20:36 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* routine to check that the specified directory is empty (for rmdir)
|
|
|
|
*/
|
|
|
|
int ext2_empty_dir (struct inode * inode)
|
|
|
|
{
|
|
|
|
struct page *page = NULL;
|
|
|
|
unsigned long i, npages = dir_pages(inode);
|
2008-10-16 13:04:02 +08:00
|
|
|
int dir_has_error = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
|
|
char *kaddr;
|
|
|
|
ext2_dirent * de;
|
2008-10-16 13:04:02 +08:00
|
|
|
page = ext2_get_page(inode, i, dir_has_error);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-10-16 13:04:02 +08:00
|
|
|
if (IS_ERR(page)) {
|
|
|
|
dir_has_error = 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
continue;
|
2008-10-16 13:04:02 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
kaddr = page_address(page);
|
|
|
|
de = (ext2_dirent *)kaddr;
|
|
|
|
kaddr += ext2_last_byte(inode, i) - EXT2_DIR_REC_LEN(1);
|
|
|
|
|
|
|
|
while ((char *)de <= kaddr) {
|
|
|
|
if (de->rec_len == 0) {
|
2008-04-28 17:16:03 +08:00
|
|
|
ext2_error(inode->i_sb, __func__,
|
2005-04-17 06:20:36 +08:00
|
|
|
"zero-length directory entry");
|
|
|
|
printk("kaddr=%p, de=%p\n", kaddr, de);
|
|
|
|
goto not_empty;
|
|
|
|
}
|
|
|
|
if (de->inode != 0) {
|
|
|
|
/* check for . and .. */
|
|
|
|
if (de->name[0] != '.')
|
|
|
|
goto not_empty;
|
|
|
|
if (de->name_len > 2)
|
|
|
|
goto not_empty;
|
|
|
|
if (de->name_len < 2) {
|
|
|
|
if (de->inode !=
|
|
|
|
cpu_to_le32(inode->i_ino))
|
|
|
|
goto not_empty;
|
|
|
|
} else if (de->name[1] != '.')
|
|
|
|
goto not_empty;
|
|
|
|
}
|
|
|
|
de = ext2_next_entry(de);
|
|
|
|
}
|
|
|
|
ext2_put_page(page);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
not_empty:
|
|
|
|
ext2_put_page(page);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-28 17:56:42 +08:00
|
|
|
const struct file_operations ext2_dir_operations = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.llseek = generic_file_llseek,
|
|
|
|
.read = generic_read_dir,
|
2016-04-21 11:42:46 +08:00
|
|
|
.iterate_shared = ext2_readdir,
|
2008-02-06 17:40:10 +08:00
|
|
|
.unlocked_ioctl = ext2_ioctl,
|
2006-08-30 02:06:20 +08:00
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
.compat_ioctl = ext2_compat_ioctl,
|
|
|
|
#endif
|
2009-12-16 08:46:49 +08:00
|
|
|
.fsync = ext2_fsync,
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|