lkml.org 
[lkml]   [2008]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/27] CacheFiles: Be consistent about the use of mapping vs file->f_mapping in Ext3
    Date
    Change all the usages of file->f_mapping in ext3_*write_end() functions to use
    the mapping argument directly. This has two consequences:

    (*) Consistency. Without this patch sometimes one is used and sometimes the
    other is.

    (*) A NULL file pointer can be passed. This feature is then made use of by
    the generic hook in the next patch, which is used by CacheFiles to write
    pages to a file without setting up a file struct.

    Signed-off-by: David Howells <dhowells@redhat.com>
    ---

    fs/ext3/inode.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)


    diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
    index 9b162cd..bc918d3 100644
    --- a/fs/ext3/inode.c
    +++ b/fs/ext3/inode.c
    @@ -1227,7 +1227,7 @@ static int ext3_generic_write_end(struct file *file,
    loff_t pos, unsigned len, unsigned copied,
    struct page *page, void *fsdata)
    {
    - struct inode *inode = file->f_mapping->host;
    + struct inode *inode = mapping->host;

    copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);

    @@ -1252,7 +1252,7 @@ static int ext3_ordered_write_end(struct file *file,
    struct page *page, void *fsdata)
    {
    handle_t *handle = ext3_journal_current_handle();
    - struct inode *inode = file->f_mapping->host;
    + struct inode *inode = mapping->host;
    unsigned from, to;
    int ret = 0, ret2;

    @@ -1293,7 +1293,7 @@ static int ext3_writeback_write_end(struct file *file,
    struct page *page, void *fsdata)
    {
    handle_t *handle = ext3_journal_current_handle();
    - struct inode *inode = file->f_mapping->host;
    + struct inode *inode = mapping->host;
    int ret = 0, ret2;
    loff_t new_i_size;



    \
     
     \ /
      Last update: 2008-01-23 01:55    [W:0.029 / U:0.468 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site