lkml.org 
[lkml]   [2007]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/33] NFS: Fix an Oops in nfs_setattr()
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    NFS: Fix an Oops in nfs_setattr()

    It looks like nfs_setattr() and nfs_rename() also need to test whether the
    target is a regular file before calling nfs_wb_all()...

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Chuck Ebbert <cebbert@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/nfs/dir.c | 3 ++-
    fs/nfs/inode.c | 6 ++++--
    2 files changed, 6 insertions(+), 3 deletions(-)

    --- a/fs/nfs/dir.c
    +++ b/fs/nfs/dir.c
    @@ -1659,7 +1659,8 @@ go_ahead:
    * ... prune child dentries and writebacks if needed.
    */
    if (atomic_read(&old_dentry->d_count) > 1) {
    - nfs_wb_all(old_inode);
    + if (S_ISREG(old_inode->i_mode))
    + nfs_wb_all(old_inode);
    shrink_dcache_parent(old_dentry);
    }
    nfs_inode_return_delegation(old_inode);
    --- a/fs/nfs/inode.c
    +++ b/fs/nfs/inode.c
    @@ -334,8 +334,10 @@ nfs_setattr(struct dentry *dentry, struc
    lock_kernel();
    nfs_begin_data_update(inode);
    /* Write all dirty data */
    - filemap_write_and_wait(inode->i_mapping);
    - nfs_wb_all(inode);
    + if (S_ISREG(inode->i_mode)) {
    + filemap_write_and_wait(inode->i_mapping);
    + nfs_wb_all(inode);
    + }
    /*
    * Return any delegations if we're going to change ACLs
    */
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-04-26 19:09    [W:2.239 / U:0.560 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site