Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efa82bab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Fix the mapping of the NFSERR_SERVERFAULT error
  NFS: Remove a redundant check for PageFsCache in nfs_migrate_page()
  NFS: Fix a bug in nfs_fscache_release_page()
parents 06a57f4f fdcb4577

fs/nfs/fscache.c

+4 −5
Original line number Diff line number Diff line
@@ -354,12 +354,11 @@ void nfs_fscache_reset_inode_cookie(struct inode *inode) 
 */

int nfs_fscache_release_page(struct page *page, gfp_t gfp)

{

	if (PageFsCache(page)) {

		struct nfs_inode *nfsi = NFS_I(page->mapping->host);

		struct fscache_cookie *cookie = nfsi->fscache;



		BUG_ON(!cookie);



	if (PageFsCache(page)) {

		dfprintk(FSCACHE, "NFS: fscache releasepage (0x%p/0x%p/0x%p)\n",

			 cookie, page, nfsi);

fs/nfs/mount_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static struct { 
	{ .status = MNT3ERR_INVAL,		.errno = -EINVAL,	},

	{ .status = MNT3ERR_NAMETOOLONG,	.errno = -ENAMETOOLONG,	},

	{ .status = MNT3ERR_NOTSUPP,		.errno = -ENOTSUPP,	},

	{ .status = MNT3ERR_SERVERFAULT,	.errno = -ESERVERFAULT,	},

	{ .status = MNT3ERR_SERVERFAULT,	.errno = -EREMOTEIO,	},

};



struct mountres {

fs/nfs/nfs2xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static struct { 
	{ NFSERR_BAD_COOKIE,	-EBADCOOKIE	},

	{ NFSERR_NOTSUPP,	-ENOTSUPP	},

	{ NFSERR_TOOSMALL,	-ETOOSMALL	},

	{ NFSERR_SERVERFAULT,	-ESERVERFAULT	},

	{ NFSERR_SERVERFAULT,	-EREMOTEIO	},

	{ NFSERR_BADTYPE,	-EBADTYPE	},

	{ NFSERR_JUKEBOX,	-EJUKEBOX	},

	{ -1,			-EIO		}

fs/nfs/nfs4xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -4631,7 +4631,7 @@ static int decode_sequence(struct xdr_stream *xdr, 
	 * If the server returns different values for sessionID, slotID or

	 * sequence number, the server is looney tunes.

	 */

	status = -ESERVERFAULT;

	status = -EREMOTEIO;



	if (memcmp(id.data, res->sr_session->sess_id.data,

		   NFS4_MAX_SESSIONID_LEN)) {
@@ -5774,7 +5774,7 @@ static struct { 
	{ NFS4ERR_BAD_COOKIE,	-EBADCOOKIE	},

	{ NFS4ERR_NOTSUPP,	-ENOTSUPP	},

	{ NFS4ERR_TOOSMALL,	-ETOOSMALL	},

	{ NFS4ERR_SERVERFAULT,	-ESERVERFAULT	},

	{ NFS4ERR_SERVERFAULT,	-EREMOTEIO	},

	{ NFS4ERR_BADTYPE,	-EBADTYPE	},

	{ NFS4ERR_LOCKED,	-EAGAIN		},

	{ NFS4ERR_SYMLINK,	-ELOOP		},
@@ -5801,7 +5801,7 @@ nfs4_stat_to_errno(int stat) 
	}

	if (stat <= 10000 || stat > 10100) {

		/* The server is looney tunes. */

		return -ESERVERFAULT;

		return -EREMOTEIO;

	}

	/* If we cannot translate the error, the recovery routines should

	 * handle it.

fs/nfs/write.c

+1 −2
Original line number Diff line number Diff line
@@ -1598,7 +1598,6 @@ int nfs_migrate_page(struct address_space *mapping, struct page *newpage, 
	struct nfs_page *req;

	int ret;



	if (PageFsCache(page))

	nfs_fscache_release_page(page, GFP_KERNEL);



	req = nfs_find_and_lock_request(page);