aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf/inode.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-10-09 06:52:16 -0400
committerJan Kara <jack@suse.cz>2014-10-09 07:06:14 -0400
commit6174c2eb8ecef271159bdcde460ce8af54d8f72f (patch)
treefc00824fdd8231ac9ee32714fc86493149af29d1 /fs/udf/inode.c
parentc53f755d339b5546600c316333140d5fe958941d (diff)
udf: Fix loading of special inodes
Some UDF media have special inodes (like VAT or metadata partition inodes) whose link_count is 0. Thus commit 4071b9136223 (udf: Properly detect stale inodes) broke loading these inodes because udf_iget() started returning -ESTALE for them. Since we still need to properly detect stale inodes queried by NFS, create two variants of udf_iget() - one which is used for looking up special inodes (which ignores link_count == 0) and one which is used for other cases which return ESTALE when link_count == 0. Fixes: 4071b913622316970d0e1919f7d82b4403fec5f2 CC: stable@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/inode.c')
-rw-r--r--fs/udf/inode.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 08598843288f..c9b4df5810d5 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1277,7 +1277,7 @@ update_time:
1277 */ 1277 */
1278#define UDF_MAX_ICB_NESTING 1024 1278#define UDF_MAX_ICB_NESTING 1024
1279 1279
1280static int udf_read_inode(struct inode *inode) 1280static int udf_read_inode(struct inode *inode, bool hidden_inode)
1281{ 1281{
1282 struct buffer_head *bh = NULL; 1282 struct buffer_head *bh = NULL;
1283 struct fileEntry *fe; 1283 struct fileEntry *fe;
@@ -1436,8 +1436,11 @@ reread:
1436 1436
1437 link_count = le16_to_cpu(fe->fileLinkCount); 1437 link_count = le16_to_cpu(fe->fileLinkCount);
1438 if (!link_count) { 1438 if (!link_count) {
1439 ret = -ESTALE; 1439 if (!hidden_inode) {
1440 goto out; 1440 ret = -ESTALE;
1441 goto out;
1442 }
1443 link_count = 1;
1441 } 1444 }
1442 set_nlink(inode, link_count); 1445 set_nlink(inode, link_count);
1443 1446
@@ -1826,7 +1829,8 @@ out:
1826 return err; 1829 return err;
1827} 1830}
1828 1831
1829struct inode *udf_iget(struct super_block *sb, struct kernel_lb_addr *ino) 1832struct inode *__udf_iget(struct super_block *sb, struct kernel_lb_addr *ino,
1833 bool hidden_inode)
1830{ 1834{
1831 unsigned long block = udf_get_lb_pblock(sb, ino, 0); 1835 unsigned long block = udf_get_lb_pblock(sb, ino, 0);
1832 struct inode *inode = iget_locked(sb, block); 1836 struct inode *inode = iget_locked(sb, block);
@@ -1839,7 +1843,7 @@ struct inode *udf_iget(struct super_block *sb, struct kernel_lb_addr *ino)
1839 return inode; 1843 return inode;
1840 1844
1841 memcpy(&UDF_I(inode)->i_location, ino, sizeof(struct kernel_lb_addr)); 1845 memcpy(&UDF_I(inode)->i_location, ino, sizeof(struct kernel_lb_addr));
1842 err = udf_read_inode(inode); 1846 err = udf_read_inode(inode, hidden_inode);
1843 if (err < 0) { 1847 if (err < 0) {
1844 iget_failed(inode); 1848 iget_failed(inode);
1845 return ERR_PTR(err); 1849 return ERR_PTR(err);