diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /fs/nfs/nfs42proc.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'fs/nfs/nfs42proc.c')
| -rw-r--r-- | fs/nfs/nfs42proc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c index 33da841a21bb..6f4752734804 100644 --- a/fs/nfs/nfs42proc.c +++ b/fs/nfs/nfs42proc.c | |||
| @@ -338,6 +338,8 @@ nfs42_layoutstat_done(struct rpc_task *task, void *calldata) | |||
| 338 | case 0: | 338 | case 0: |
| 339 | break; | 339 | break; |
| 340 | case -NFS4ERR_EXPIRED: | 340 | case -NFS4ERR_EXPIRED: |
| 341 | case -NFS4ERR_ADMIN_REVOKED: | ||
| 342 | case -NFS4ERR_DELEG_REVOKED: | ||
| 341 | case -NFS4ERR_STALE_STATEID: | 343 | case -NFS4ERR_STALE_STATEID: |
| 342 | case -NFS4ERR_OLD_STATEID: | 344 | case -NFS4ERR_OLD_STATEID: |
| 343 | case -NFS4ERR_BAD_STATEID: | 345 | case -NFS4ERR_BAD_STATEID: |