Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[~shefty/rdma-dev.git] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 398a15a99a1b61e67995a6768eab9f2a21ce079d..ae82159cf7fa6921bb3a27a1fc5e56fbb1045a5c 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1302,7 +1302,6 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to)
 static int cifs_writepages(struct address_space *mapping,
                           struct writeback_control *wbc)
 {
 static int cifs_writepages(struct address_space *mapping,
                           struct writeback_control *wbc)
 {

-       struct backing_dev_info *bdi = mapping->backing_dev_info;

        unsigned int bytes_to_write;
        unsigned int bytes_written;
        struct cifs_sb_info *cifs_sb;
        unsigned int bytes_to_write;
        unsigned int bytes_written;
        struct cifs_sb_info *cifs_sb;


@@ -1325,15 +1324,6 @@ static int cifs_writepages(struct address_space *mapping,
        int scanned = 0;
        int xid, long_op;
 
        int scanned = 0;
        int xid, long_op;
 

-       /*
-        * BB: Is this meaningful for a non-block-device file system?
-        * If it is, we should test it again after we do I/O
-        */
-       if (wbc->nonblocking && bdi_write_congested(bdi)) {
-               wbc->encountered_congestion = 1;
-               return 0;
-       }
-

        cifs_sb = CIFS_SB(mapping->host->i_sb);
 
        /*
        cifs_sb = CIFS_SB(mapping->host->i_sb);
 
        /*